| commit | 6f53c3b21e3899716caccc2f88a1186ca7fa0f60 | |
| author | Christian Couder <chriscool@tuxfamily.org> | |
| Sat, 16 Jan 2010 09:20:26 +0000 (16 10:20 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 16 Jan 2010 16:54:36 +0000 (16 08:54 -0800) | ||
| tree | 2570947546805578a60a87329dc8f73adf78f076 | treesnapshot (tar.gz zip) |
| parent | d7eed8cbef2d15e87e9002f5e3ce08830b40b292 | commitdiff |
t7111: fix bad HEAD in tests with unmerged entries
When testing what happens on unmerged entries, the HEAD is the
commit we are starting from before the merge that fails and create
the unmerged entries. It is not the commit before.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When testing what happens on unmerged entries, the HEAD is the
commit we are starting from before the merge that fails and create
the unmerged entries. It is not the commit before.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7111-reset-table.sh | diffblobblamehistory |