From: Junio C Hamano <junkio@cox.net>
Date: Wed, 8 Jun 2005 09:08:54 +0000 (-0700)
Subject: [PATCH] Tests: read-tree -m test updates.
X-Git-Tag: v0.99~313
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7d95ee935182a06374d152d7638bdd999e78f80b?hp=7d95ee935182a06374d152d7638bdd999e78f80b

[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>
---