diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-18 02:43:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 22:46:28 -0800 |
| commit | 566c511195adc0ce88559853f2f00933e241d862 (patch) | |
| tree | d9d5e46eecc90787a643cc84e6c120d0d52d10cc /ll-merge.c | |
| parent | e3cba962b172804ca1cab82801d94858154bd8cc (diff) | |
| download | git-566c511195adc0ce88559853f2f00933e241d862.tar.gz | |
Document that merge strategies can now take their own options
Also document the recently added -Xtheirs, -Xours and -Xsubtree[=path]
options to the merge-recursive strategy.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions