Files
git/builtin
Junio C Hamano 099f3c421a apply: --3way with add/add conflict
When a patch wants to create a path, but we already have it in our
current state, pretend as if the patch and we independently added
the same path and cause add/add conflict, so that the user can
resolve it just like "git merge" in the same situation.

For that purpose, implement load_current() in terms of the
load_patch_target() helper introduced earlier to read the current
contents from the path given by patch->new_name (patch->old_name is
NULL for a creation patch).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-09 14:40:03 -07:00
..
2012-07-09 14:40:03 -07:00
2012-04-23 12:58:23 -07:00
2012-05-03 15:13:31 -07:00
2012-04-16 12:42:22 -07:00
2012-01-06 12:44:07 -08:00
2012-05-03 15:13:31 -07:00
2012-03-28 15:19:17 -07:00
2012-05-02 13:51:35 -07:00
2012-04-18 16:17:42 -07:00
2012-03-01 20:59:31 -08:00
2012-05-03 15:13:31 -07:00
2012-04-15 22:50:39 -07:00
2011-12-28 11:32:36 -08:00
2011-12-22 11:27:26 -08:00
2012-05-02 13:51:24 -07:00
2012-05-02 13:51:35 -07:00
2012-04-30 14:58:01 -07:00
2012-04-27 09:26:39 -07:00