merge-recursive --renormalize
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 5 Aug 2010 11:32:41 +0000 (06:32 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Aug 2010 16:20:02 +0000 (09:20 -0700)
commit7610fa5...e63b0acc0a66717fc2d85755634db591
tree068161c...d6ca96746439efda939c4d15beba190dcopy hash to clipboard (tree)
parentff8ba59...7b015ba96d6a3271000f16aa71dc4a6fcopy hash to clipboard (diff)
Documentation/merge-strategies.txt
builtin/checkout.c
builtin/merge-recursive.c
builtin/merge.c
builtin/revert.c
cache.h
environment.c
merge-recursive.c