diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
| commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
| tree | d604d58fdb9d655e784d30b28b157e01eb289621 /t/t7600-merge.sh | |
| parent | e75bf76f5462af4185d8260f6feecf24dd24a516 (diff) | |
| parent | 1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff) | |
| download | git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.gz | |
Merge branch 'sb/dashless'
* sb/dashless:
Make usage strings dash-less
t/: Use "test_must_fail git" instead of "! git"
t/test-lib.sh: exit with small negagive int is ok with test_must_fail
Conflicts:
builtin-blame.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-shortlog.c
git-am.sh
t/t4150-am.sh
t/t4200-rerere.sh
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 9ab5bdacc4..26cf8dc7c1 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -126,7 +126,7 @@ verify_merge() { echo "[OOPS] unmerged files" false fi && - if ! git diff --exit-code + if test_must_fail git diff --exit-code then echo "[OOPS] working tree != index" false |