![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 11 Oct 2009 20:38:11 +0000 (13:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Jan 2010 07:25:13 +0000 (23:25 -0800) | ||
| commit | cee2d6ae6379e7c76e602d55ccc1d4babc1979c0 | |
| tree | 5363e19452ffd7c5e86c7ea68a7bc1ffd2f6c93e | tree | snapshot |
| parent | 1ee26571e97c64bccecfd26d1a1c1c631412a1b7 | commit | diff |
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>
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>
| t/t6035-merge-dir-to-symlink.sh | diff | blob | history | |
| unpack-trees.c | diff | blob | history |