Skip to content

status: remove the empty line after hints #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

status: remove the empty line after hints #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions t/t7060-wtstatus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ You have unmerged paths.

Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)

deleted by us: foo

no changes added to commit (use "git add" and/or "git commit -a")
Expand Down Expand Up @@ -143,7 +142,6 @@ You have unmerged paths.

Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)

both added: conflict.txt
deleted by them: main.txt

Expand Down Expand Up @@ -177,7 +175,6 @@ You have unmerged paths.

Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)

both deleted: main.txt
added by them: sub_master.txt
added by us: sub_second.txt
Expand All @@ -201,12 +198,10 @@ You have unmerged paths.
(use "git merge --abort" to abort the merge)

Changes to be committed:

new file: sub_master.txt

Unmerged paths:
(use "git rm <file>..." to mark resolution)

both deleted: main.txt

Untracked files not listed (use -u option to show untracked files)
Expand Down
Loading