X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7606-merge-custom.sh;h=52a451dd5782ab584ba34e73abaef32d5e332537;hb=d5c527448db30be55553e0b125015e8d444f8dbc;hp=de9b6ed5ba0d1753bbc45386bb3d4fe487ccc725;hpb=59d94bc9c851f9f4086a857bc6277feca6a48824;p=git.git diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh index de9b6ed5b..52a451dd5 100755 --- a/t/t7606-merge-custom.sh +++ b/t/t7606-merge-custom.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='git-merge +test_description='git merge Testing a custom strategy.'