summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2010-01-16 10:20:26 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-16 08:54:36 -0800
commit6f53c3b21e3899716caccc2f88a1186ca7fa0f60 (patch)
tree2570947546805578a60a87329dc8f73adf78f076 /templates
parentt7111: check that reset options work as described in the tables (diff)
downloadtgif-6f53c3b21e3899716caccc2f88a1186ca7fa0f60.tar.xz
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>
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions