Skip to content

Commit b2f5171

Browse files
johnlinpgitster
johnlinp
authored and
gitster
committed
status: remove the empty line after hints
Before this patch, there is inconsistency between the status messages with hints and the ones without hints: there is an empty line between the title and the file list if hints are presented, but there isn't one if there are no hints. This patch remove the inconsistency by removing the empty lines even if hints are presented. Signed-off-by: John Lin <johnlinp@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 97ed685 commit b2f5171

File tree

4 files changed

+0
-85
lines changed

4 files changed

+0
-85
lines changed

‎t/t7060-wtstatus.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ You have unmerged paths.
3838
3939
Unmerged paths:
4040
(use "git add/rm <file>..." as appropriate to mark resolution)
41-
4241
deleted by us: foo
4342
4443
no changes added to commit (use "git add" and/or "git commit -a")
@@ -143,7 +142,6 @@ You have unmerged paths.
143142
144143
Unmerged paths:
145144
(use "git add/rm <file>..." as appropriate to mark resolution)
146-
147145
both added: conflict.txt
148146
deleted by them: main.txt
149147
@@ -177,7 +175,6 @@ You have unmerged paths.
177175
178176
Unmerged paths:
179177
(use "git add/rm <file>..." as appropriate to mark resolution)
180-
181178
both deleted: main.txt
182179
added by them: sub_master.txt
183180
added by us: sub_second.txt
@@ -201,12 +198,10 @@ You have unmerged paths.
201198
(use "git merge --abort" to abort the merge)
202199
203200
Changes to be committed:
204-
205201
new file: sub_master.txt
206202
207203
Unmerged paths:
208204
(use "git rm <file>..." to mark resolution)
209-
210205
both deleted: main.txt
211206
212207
Untracked files not listed (use -u option to show untracked files)

0 commit comments

Comments
 (0)