git-merge: exclude unnecessary options from OPTIONS_SPEC
authorMiklos Vajna <vmiklos@frugalware.org>
Mon, 12 May 2008 17:22:56 +0000 (19:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 19:54:49 +0000 (12:54 -0700)
commitc3170a8...d6fee30c5d10afe33d88867ba0b68218
treecdaa242...3da23edf0784529cca0913660f7418e5copy hash to clipboard (tree)
parent26ec126...9166be39f79e746a3a8c92205c983820copy hash to clipboard (diff)
git-merge.sh