Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: fix handling of even funkier branch names
[gitweb.git]
/
t
/
t7600-merge.sh
diff --git
a/t/t7600-merge.sh
b/t/t7600-merge.sh
index 6a2b12558a85db2d522b3cc6047b1d5b1b7fb327..9516f541e9c47f83fed2fc8d3baa065a9bb206de 100755
(executable)
--- a/
t/t7600-merge.sh
+++ b/
t/t7600-merge.sh
@@
-3,7
+3,7
@@
# Copyright (c) 2007 Lars Hjemli
#
-test_description='git
-
merge
+test_description='git
merge
Testing basic merge operations/option parsing.'