path: root/builtin/merge-recursive.c
diff options
authorJonathan Nieder <>2010-08-05 11:25:34 (GMT)
committerJunio C Hamano <>2010-08-06 16:20:02 (GMT)
commitf7314882c26b34c4c1039b65b1c8e6b380d30674 (patch)
tree7fb0c44ea24cc6102be7a3274081e261f697e792 /builtin/merge-recursive.c
parent18b037a5b61532cba7f19efdb2e75c258d87d3d7 (diff)
t4200 (rerere): modernize style
Guard all test code with test_expect_success to make the script easier to follow. While at it, pick some other nits: - use test_tick (more than we have to, to be realistic); - 'single quotes' and \escaped HERE documents where possible simplify review for escaping problems; - omit whitespace after >redirection operators for consistency with other tests; - use "update-index --refresh" instead of testing that "ls-files -u" output is empty, since the former produces nicer output on failure; - compare to expected nonempty "ls-files -u" output instead of counting lines when it is expected to be nonempty. Signed-off-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions