+test_expect_success 'status when conflicts resolved before commit' '
+ test_when_finished "
+ git commit -m "end_merge" &&
The " are respectively closing quote for the one on the line before, and
opening quote. Avoid nesting quotes, avoid quotes ;-).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/