diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-26 05:47:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-26 16:05:02 (GMT) |
| commit | 635a7bb1d807390bedfc1147d2052e8423bcd1e0 (patch) | |
| tree | 317b28d6a3d042cb3a5e728f62751e905b076535 /builtin/checkout.c | |
| parent | 7610fa57e63b0acc0a66717fc2d85755634db591 (diff) | |
| download | git-635a7bb1d807390bedfc1147d2052e8423bcd1e0.zip git-635a7bb1d807390bedfc1147d2052e8423bcd1e0.tar.gz git-635a7bb1d807390bedfc1147d2052e8423bcd1e0.tar.bz2 | |
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>
Diffstat (limited to 'builtin/checkout.c')
0 files changed, 0 insertions, 0 deletions