From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Jan 2010 01:18:01 +0000 (-0800)
Subject: Merge branch 'cc/reset-more'
X-Git-Tag: v1.7.0-rc0~98
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0346e324c2acdd763224cc071d6a6d0f55a982a1;p=git.git

Merge branch 'cc/reset-more'

* cc/reset-more:
  t7111: fix bad HEAD in tests with unmerged entries
---

0346e324c2acdd763224cc071d6a6d0f55a982a1