diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-11-04 22:33:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-06 22:44:34 -0800 |
| commit | 7c5858a643724a9a4a67f1290c03d57f483ed261 (patch) | |
| tree | 53026d647397b218c3c575c5b373941f5bbd54c7 /path.c | |
| parent | 1a994dc3d258a1603752e0c472b072acc343a963 (diff) | |
| download | git-7c5858a643724a9a4a67f1290c03d57f483ed261.tar.gz | |
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>
Diffstat (limited to 'path.c')
0 files changed, 0 insertions, 0 deletions