projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f73566 6f53c3b)
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
Git—the stupid content tracker