Migrate git-merge.sh to use git-rev-parse --parseopt
commitb0bf1d8b7952d6119b0737b80873c987fdc75e55
authorPierre Habouzit <madcoder@debian.org>
Sun, 4 Nov 2007 10:30:58 +0000 (4 11:30 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Nov 2007 06:48:13 +0000 (5 22:48 -0800)
tree860f4384993166b890d1f83adf10388118e6766a
parent78443d90491c1b82afdffc3d5d2ab8c1a58928b5
Migrate git-merge.sh to use git-rev-parse --parseopt

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge.sh