t7111: fix bad HEAD in tests with unmerged entries
authorChristian Couder <chriscool@tuxfamily.org>
Sat, 16 Jan 2010 09:20:26 +0000 (10:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sat, 16 Jan 2010 16:54:36 +0000 (08:54 -0800)
When testing what happens on unmerged entries, the HEAD is the
commit we are starting from before the merge that fails and create
the unmerged entries. It is not the commit before.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found