cmd_merge(): Parse options before checking MERGE_HEAD
authorJohan Herland <johan@herland.net>
Tue, 9 Nov 2010 21:49:58 +0000 (22:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:23:55 +0000 (13:23 -0800)
commit2a22c1b...5d6110e72d86a2fac4b68dbad0905adb
treed4edcb4...da9517972f8d11911acb80799e3f0b39copy hash to clipboard (tree)
parent618cd75...07580819f19a5f01dba406ac72219c78copy hash to clipboard (diff)
builtin/merge.c