diff options
| author |  Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-03 17:59:33 +0900 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:48 -0700 |
| commit | 47a528ad24185133867ebb5bb7692db2cb8bef39 (patch) | |
| tree | 9b46d4c6af949929f7ba2fe9f863b8304d0994fb /t/t7605-merge-resolve.sh | |
| parent | tests: use "git xyzzy" form (t7000 - t7199) (diff) | |
| download | tgif-47a528ad24185133867ebb5bb7692db2cb8bef39.tar.xz | |
tests: use "git xyzzy" form (t7200 - t9001)
Converts tests between t7201-t9001.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7605-merge-resolve.sh')
| -rwxr-xr-x | t/t7605-merge-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh index f1f86ddb23..0cb9d11f21 100755 --- a/t/t7605-merge-resolve.sh +++ b/t/t7605-merge-resolve.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='git-merge +test_description='git merge Testing the resolve strategy.' |