merge-recursive --patience
authorJustin Frankel <justin@cockos.com>
Thu, 26 Aug 2010 05:50:45 +0000 (00:50 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Aug 2010 16:20:03 +0000 (09:20 -0700)
commit58a1ece...78c6038a7eb0b6e494d563bd5e6d5978
treeea845e2...62c6e9a713455c6108a85677b9d4e0edcopy hash to clipboard (tree)
parent712516b...acacd45b4825ec649f15c3573f6fb42acopy hash to clipboard (diff)
Documentation/merge-strategies.txt
builtin/merge-recursive.c
ll-merge.c
ll-merge.h
merge-recursive.c
merge-recursive.h