]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c52ff85) | patch
merge-recursive: Small cleanups for conflict_rename_rename_1to2
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:14 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700)
commita99b7f2256ebd2d1db59c578f3da003e36f259c4
treee109f90e74a5a95b38f965e28a41044ac07536f4tree | snapshot
parentc52ff85d97c698c902870305a010e2303e297b87commit | diff
merge-recursive: Small cleanups for conflict_rename_rename_1to2

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.