diff options
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/read-tree.c b/read-tree.c index d86cc0263c..0d94fe214d 100644 --- a/read-tree.c +++ b/read-tree.c @@ -280,6 +280,12 @@ static int threeway_merge(struct cache_entry *stages[4], } /* otherwise we will apply the original rule */ } + /* #14ALT */ + if (a && b && c && same(a, b) && !same(a, c)) { + if (old && same(old, c)) + return merged_entry_allow_dirty(c, old, dst); + /* otherwise the regular rule applies */ + } /* * If we have an entry in the index cache ("old"), then we want * to make sure that it matches any entries in stage 2 ("first |