]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b703325) | patch
merge-recursive: Have conflict_rename_delete reuse modify/delete code
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:20 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:39 +0000 (14:19 -0700)
commite03acb8bc1f03827210235dd72578b8b26f19c51
treefad3ab9d30a872700493276f20c894749191253ftree | snapshot
parentb70332520d2ba0f32b5006feff86d71242061011commit | diff
merge-recursive: Have conflict_rename_delete reuse modify/delete code

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.