![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Mon, 16 Aug 2010 01:08:46 +0000 (20:08 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Aug 2010 03:09:27 +0000 (20:09 -0700) | ||
| commit | 6209036c7843f4095c04b5ecc13199cc4eccaf3f | |
| tree | f54c9a7c1e6c1c7ab8e54836ded6b54213cfa312 | tree | snapshot |
| parent | 64fdc08dac6694d1e754580e7acb82dfa4988bb9 | commit | diff |
t7606 (merge-theirs): modernize style
Guard setup commands with test_expect_success, so they are easier
to visually skip over and get to the good part. While at it:
- use test_commit for brevity and reproducible object names;
- use test_cmp instead of using the test builtin to compare the
result of command substitution, for better output with -v on
failure.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Guard setup commands with test_expect_success, so they are easier
to visually skip over and get to the good part. While at it:
- use test_commit for brevity and reproducible object names;
- use test_cmp instead of using the test builtin to compare the
result of command substitution, for better output with -v on
failure.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7606-merge-custom.sh | diff | blob | history |