t6036: Test index and worktree state, not just that merge fails
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:44 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:37 +0000 (17:32 -0700)
commitc976260...0f3d3f99dc3594e3f98436bfd920dc97
tree954c085...42faae21fde61dd6c9e73c23134bbf95copy hash to clipboard (tree)
parentfa0ae3b...ddeeb8c872f3804950fa95b5fc8b4138copy hash to clipboard (diff)
t/t6036-recursive-corner-cases.sh