diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-26 00:47:58 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-26 09:05:02 -0700 |
| commit | 635a7bb1d807390bedfc1147d2052e8423bcd1e0 (patch) | |
| tree | 317b28d6a3d042cb3a5e728f62751e905b076535 /t/t4150-am.sh | |
| parent | merge-recursive --renormalize (diff) | |
| download | tgif-635a7bb1d807390bedfc1147d2052e8423bcd1e0.tar.xz | |
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 't/t4150-am.sh')
0 files changed, 0 insertions, 0 deletions