Stephen Boyd 7c5858a643 t1200: Make documentation and test agree ...

There were some differences between t1200 and the gitcore-tutorial. Add
missing tests for manually merging two branches, and use the same
commands in both files.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2009-11-06 22:44:34 -08:00

62 KiB

Raw Blame History

View Raw