Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
notes: spell first word of error messages in lowercase
[gitweb.git]
/
t
/
t7512-status-help.sh
diff --git
a/t/t7512-status-help.sh
b/t/t7512-status-help.sh
index 49d19a3b36d0649dfd01de29acdbf0fab2532e17..5c3db656dfaa0171598445720b62e63f13f67f44 100755
(executable)
--- a/
t/t7512-status-help.sh
+++ b/
t/t7512-status-help.sh
@@
-29,6
+29,7
@@
test_expect_success 'status when conflicts unresolved' '
On branch conflicts
You have unmerged paths.
(fix conflicts and run "git commit")
+ (use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)