summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-07 05:42:01 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-10 12:55:51 -0700
commitea4b52a86f6b6b8e5aef8e47fb557f37422512bf (patch)
tree31aa071b56a37a864ca6ed563cb785b53e962b4b /unpack-trees.c
parent8ff21b1a3307c7059ea1e00b5117a50a2bc5fec8 (diff)
downloadgit-ea4b52a86f6b6b8e5aef8e47fb557f37422512bf.tar.gz
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>
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index a0b676903a..2a58b7fa28 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -786,7 +786,7 @@ int threeway_merge(struct cache_entry **stages,
o->nontrivial_merge = 1;
- /* #2, #3, #4, #6, #7, #9, #11. */
+ /* #2, #3, #4, #6, #7, #9, #10, #11. */
count = 0;
if (!head_match || !remote_match) {
for (i = 1; i < o->head_idx; i++) {