X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7610-mergetool.sh;h=09fa5f115c9fabe1fec60a5597439b2c7f9ded6d;hb=ec74042dc7d81238d2c6d898331ff3b7e12a5d75;hp=9285071c473dcfe7d37845d01ba20226b5ab585d;hpb=57b0fc4516249e1aa86169718d148fbf2940dc0c;p=git.git diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 9285071c4..09fa5f115 100755 --- 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'