diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-11 22:38:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-04 08:25:13 +0100 |
| commit | cee2d6ae6379e7c76e602d55ccc1d4babc1979c0 (patch) | |
| tree | 5363e19452ffd7c5e86c7ea68a7bc1ffd2f6c93e /unpack-trees.h | |
| parent | traverse_trees(): handle D/F conflict case sanely (diff) | |
| download | git-cee2d6ae6379e7c76e602d55ccc1d4babc1979c0.tar.xz git-cee2d6ae6379e7c76e602d55ccc1d4babc1979c0.zip | |
Aggressive three-way merge: fix D/F case
When the ancestor used to have a blob "P", your tree removed it, and the
tree you are merging with also removed it, the agressive three-way cleanly
merges to remove that blob. If the other tree added a new blob "P/Q"
while removing "P", it should also merge cleanly to remove "P" and create
"P/Q" (since neither the ancestor nor your tree could have had it, so it
is a typical "created in one").
The "aggressive" rule is not new anymore. Reword the stale comment.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions