![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 01:18:01 +0000 (17:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 01:18:01 +0000 (17:18 -0800) | ||
| commit | 0346e324c2acdd763224cc071d6a6d0f55a982a1 | |
| tree | 2c50191d9018adbe2d058b035d98c50626512ef9 | tree | snapshot |
| parent | 1f73566af5bec28cd8489c6139a9ede95817349c | commit | diff |
| parent | 6f53c3b21e3899716caccc2f88a1186ca7fa0f60 | commit | diff |
Merge branch 'cc/reset-more'
* cc/reset-more:
t7111: fix bad HEAD in tests with unmerged entries
* cc/reset-more:
t7111: fix bad HEAD in tests with unmerged entries