t1000: fix case table.
Case #10 is not handled with unpack-trees.c:threeway_merge() internally, unless under the agressive rule, and it is not a bug. As the test expects, ND (one side did not do anything, other side deleted) case was meant to be handled by the caller's policy (e.g. git-merge-one-file or git-merge-recursive). Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 7, 2007 at 05:42 UTC
ea4b52a86f6b6b8e5aef8e47fb557f37422512bf
2 files changed
+2
-2
t/t1000-read-tree-m-3way.sh
+1
-1
@@ -184,7 +184,7 @@ checked.
184
9 exists O!=A missing no merge must match A and be
185
up-to-date, if exists.
186
------------------------------------------------------------------
187
- 10 exists O==A missing remove ditto
187
+ 10 exists O==A missing no merge must match A
188
------------------------------------------------------------------
189
11 exists O!=A O!=B no merge must match A and be
190
A!=B up-to-date, if exists.
unpack-trees.c
+1
-1
@@ -786,7 +786,7 @@ int threeway_merge(struct cache_entry **stages,
786
787
o->nontrivial_merge = 1;
788
789
- /* #2, #3, #4, #6, #7, #9, #11. */
789
+ /* #2, #3, #4, #6, #7, #9, #10, #11. */
790
count = 0;
791
if (!head_match || !remote_match) {
792
for (i = 1; i < o->head_idx; i++) {