]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 605c1bc) | patch
merge-recursive: Move rename/delete handling into dedicated function
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:50 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:38 +0000 (17:32 -0700)
commit6ef2cb008f132e4649ef925a8e1950d3138054d5
treecaff30b74c5a7b66ea094afd6d50b5cdffb03ae0tree | snapshot
parent605c1bcfc46b60f76dfb4f89f76029b7bb13d232commit | diff
merge-recursive: Move rename/delete handling into dedicated function

This move is in preparation for the function growing and 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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.