projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1a994dc) | patch
t1200: Make documentation and test agree
authorStephen Boyd <bebarino@gmail.com>
Thu, 5 Nov 2009 06:33:53 +0000 (22:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Nov 2009 06:44:34 +0000 (22:44 -0800)
commit7c5858a643724a9a4a67f1290c03d57f483ed261
tree53026d647397b218c3c575c5b373941f5bbd54c7tree | snapshot
parent1a994dc3d258a1603752e0c472b072acc343a963commit | diff
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>
Documentation/gitcore-tutorial.txt diff | blob | history
t/t1200-tutorial.sh diff | blob | history
Git—the stupid content tracker