| commit | 635a7bb1d807390bedfc1147d2052e8423bcd1e0 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Thu, 26 Aug 2010 05:47:58 +0000 (26 00:47 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Aug 2010 16:05:02 +0000 (26 09:05 -0700) | ||
| tree | 317b28d6a3d042cb3a5e728f62751e905b076535 | treesnapshot (tar.gz zip) |
| parent | 7610fa57e63b0acc0a66717fc2d85755634db591 | commitdiff |
merge-recursive: expose merge options for builtin merge
There are two very similar blocks of code that recognize options for
the "recursive" merge strategy. Unify them.
No functional change intended.
Cc: Avery Pennarun <apenwarr@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
There are two very similar blocks of code that recognize options for
the "recursive" merge strategy. Unify them.
No functional change intended.
Cc: Avery Pennarun <apenwarr@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge-recursive.c | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory | |
| merge-recursive.h | diffblobblamehistory |