Merge branch 'cc/reset-more'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 01:18:01 +0000 (17:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 01:18:01 +0000 (17:18 -0800)
commit0346e324c2acdd763224cc071d6a6d0f55a982a1
tree2c50191d9018adbe2d058b035d98c50626512ef9
parent1f73566af5bec28cd8489c6139a9ede95817349c
parent6f53c3b21e3899716caccc2f88a1186ca7fa0f60
Merge branch 'cc/reset-more'

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