diff options
author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-03 12:59:33 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-09-04 01:51:48 +0400 |
commit | 47a528ad24185133867ebb5bb7692db2cb8bef39 (patch) | |
tree | 9b46d4c6af949929f7ba2fe9f863b8304d0994fb /t/t7600-merge.sh | |
parent | d592b3157f70c9dac6288b28c46a64826c0abd18 (diff) |
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/t7600-merge.sh')
-rwxr-xr-x | t/t7600-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index dbc90bc416..94bc556cb2 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -3,7 +3,7 @@ # Copyright (c) 2007 Lars Hjemli # -test_description='git-merge +test_description='git merge Testing basic merge operations/option parsing.' |