Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
branch: allow a no-op "branch -M <current-branch> HEAD"
[gitweb.git]
/
t
/
t7605-merge-resolve.sh
diff --git
a/t/t7605-merge-resolve.sh
b/t/t7605-merge-resolve.sh
index f1f86ddb2381ce70e6845298e86ed96d6399fdf9..0cb9d11f2171de19b260391017310f0ee792f89b 100755
(executable)
--- a/
t/t7605-merge-resolve.sh
+++ b/
t/t7605-merge-resolve.sh
@@
-1,6
+1,6
@@
#!/bin/sh
-test_description='git
-
merge
+test_description='git
merge
Testing the resolve strategy.'