diff options
| author |  Miklos Vajna <vmiklos@frugalware.org> | 2008-07-20 14:12:48 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-20 11:34:06 -0700 |
| commit | ec96224e215f1b2f143524afa339564271c11e12 (patch) | |
| tree | 7ae4c861e6347e3251885b00500a47c0fce1e17a /git-gui/macosx | |
| parent | cvsserver: Add testsuite for packed refs (diff) | |
| download | tgif-ec96224e215f1b2f143524afa339564271c11e12.tar.xz | |
Teach 'git merge' that some merge strategies no longer exist
'recur' co-existed with 'recursive' when rewriting it in C, but it no
longer available. 'stupid' was also recently removed.
"git merge -s confused origin" still includes them in the list of
available merge strategies.
[jc: this is a squash of two micropatches]
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/macosx')
0 files changed, 0 insertions, 0 deletions