projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make "git commit" handle initial commits too
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
d86cc02
..
0d94fe2
100644
(file)
--- 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 */
}
}
/* 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
/*
* 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