projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 64fdc08) | patch
t7606 (merge-theirs): modernize style
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 16 Aug 2010 01:08:46 +0000 (20:08 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Aug 2010 03:09:27 +0000 (20:09 -0700)
commit6209036c7843f4095c04b5ecc13199cc4eccaf3f
treef54c9a7c1e6c1c7ab8e54836ded6b54213cfa312tree | snapshot
parent64fdc08dac6694d1e754580e7acb82dfa4988bb9commit | 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>
t/t7606-merge-custom.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.