diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-08 09:08:54 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 17:19:53 (GMT) |
| commit | 7d95ee935182a06374d152d7638bdd999e78f80b (patch) | |
| tree | a229bed41314c77450d0cc188758286529ff59fe /diffcore-pickaxe.c | |
| parent | 5b1ea09de1eb2ae190169ca77e16a79de0e1ede7 (diff) | |
| download | git-7d95ee935182a06374d152d7638bdd999e78f80b.zip git-7d95ee935182a06374d152d7638bdd999e78f80b.tar.gz git-7d95ee935182a06374d152d7638bdd999e78f80b.tar.bz2 | |
[PATCH] Tests: read-tree -m test updates.
This updates t1000 (basic 3-way merge test) to check the merge
results for both successful cases (earlier one checked the
result for only one of them). Also fixes typos in t1002 that
broke '&&' chain, potentially missing a test failure before the
chain got broken.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions