diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:51 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:38 -0700 |
| commit | 5e3ce663b03bf14443ef8b4c60b407664f97040b (patch) | |
| tree | a6139d700026f094ae73126fad0046639d44a84d /git-rebase.sh | |
| parent | 6ef2cb008f132e4649ef925a8e1950d3138054d5 (diff) | |
| download | git-5e3ce663b03bf14443ef8b4c60b407664f97040b.tar.gz | |
merge-recursive: Move delete/modify handling into dedicated function
This move is in preparation for the function being called from multiple
places in order to handle D/F conflicts.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
0 files changed, 0 insertions, 0 deletions