Andrew's git / gitweb.git / diff
?
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)
* cc/reset-more:
t7111: fix bad HEAD in tests with unmerged entries

Trivial merge