projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5b1ea09) | patch
[PATCH] Tests: read-tree -m test updates.
authorJunio C Hamano <junkio@cox.net>
Wed, 8 Jun 2005 09:08:54 +0000 (02:08 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 17:19:53 +0000 (10:19 -0700)
commit7d95ee935182a06374d152d7638bdd999e78f80b
treea229bed41314c77450d0cc188758286529ff59fetree | snapshot
parent5b1ea09de1eb2ae190169ca77e16a79de0e1ede7commit | diff
[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>
t/t1000-read-tree-m-3way.sh diff | blob | history
t/t1002-read-tree-m-u-2way.sh diff | blob | history
The core git plumbing