diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:19 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:39 -0700 |
| commit | b70332520d2ba0f32b5006feff86d71242061011 (patch) | |
| tree | c331312b75e4770bdb6180d762417518d59060b3 /builtin | |
| parent | merge-recursive: Consider modifications in rename/rename(2to1) conflicts (diff) | |
| download | tgif-b70332520d2ba0f32b5006feff86d71242061011.tar.xz | |
merge-recursive: Make modify/delete handling code reusable
modify/delete and rename/delete share a lot of similarities; we'd like all
the criss-cross and D/F conflict handling specializations to be shared
between the two.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions