Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
[gitweb.git]
/
t
/
t9114-git-svn-dcommit-merge.sh
diff --git
a/t/t9114-git-svn-dcommit-merge.sh
b/t/t9114-git-svn-dcommit-merge.sh
index 61d7781616eed4374c014cabd75a297c2baa348d..17b2855c4f308d463ea239f355549120dab4f80f 100755
(executable)
--- a/
t/t9114-git-svn-dcommit-merge.sh
+++ b/
t/t9114-git-svn-dcommit-merge.sh
@@
-3,7
+3,7
@@
# Copyright (c) 2007 Eric Wong
# Based on a script by Joakim Tjernlund <joakim.tjernlund@transmode.se>
-test_description='git
-
svn dcommit handles merges'
+test_description='git
svn dcommit handles merges'
. ./lib-git-svn.sh