Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ag/blame-encoding'
[gitweb.git]
/
t
/
t7610-mergetool.sh
diff --git
a/t/t7610-mergetool.sh
b/t/t7610-mergetool.sh
index 9285071c473dcfe7d37845d01ba20226b5ab585d..09fa5f115c9fabe1fec60a5597439b2c7f9ded6d 100755
(executable)
--- a/
t/t7610-mergetool.sh
+++ b/
t/t7610-mergetool.sh
@@
-3,7
+3,7
@@
# Copyright (c) 2008 Charles Bailey
#
-test_description='git
-
mergetool
+test_description='git
mergetool
Testing basic merge tool invocation'