checkout: error out when index is unmerged even with -m
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Feb 2008 23:45:19 +0000 (15:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Feb 2008 08:36:31 +0000 (00:36 -0800)
commit04c9e11...2cffaf84dd20602f811bf377f6033cb6
treed208cc0...f78b3467718c499fca7b50c03b0c9f87copy hash to clipboard (tree)
parent52229a2...c78df2e48de23ed70ab1934667971d3ccopy hash to clipboard (diff)
builtin-checkout.c