diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-07 15:04:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 14:40:03 -0700 |
| commit | 099f3c421a446e2eef3a1bb6aea0e451711ddd88 (patch) | |
| tree | 4b867c8cb14a5d9aa181bc9958cb199544c03b83 /builtin/commit.c | |
| parent | apply: move verify_index_match() higher (diff) | |
| download | git-099f3c421a446e2eef3a1bb6aea0e451711ddd88.tar.gz git-099f3c421a446e2eef3a1bb6aea0e451711ddd88.zip | |
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>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions