diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2010-03-31 21:22:08 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-04-01 11:14:11 -0700 |
| commit | 91e525989665d69ace11b8f39618b1e8004fe19a (patch) | |
| tree | 11e5ea3dc5fb54006f8ac74d6d739be52eb4c47e /diffcore.h | |
| parent | merge: make function try_merge_command non static (diff) | |
| download | tgif-91e525989665d69ace11b8f39618b1e8004fe19a.tar.xz | |
revert: add "--strategy" option to choose merge strategy
This patch makes it possible to use a different merge strategy when
cherry-picking. This is usefull mainly for debugging purposes as it
allows to see if some failures are caused by the merge strategy used or
not.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions