X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7606-merge-custom.sh;h=52a451dd5782ab584ba34e73abaef32d5e332537;hb=78a935d48b28ebf5b1af348d7e57763f2955afd1;hp=de9b6ed5ba0d1753bbc45386bb3d4fe487ccc725;hpb=4be4680cbb37cd803fa018c736879d936cd45671;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.'