summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-16 17:18:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-16 17:18:01 -0800
commit0346e324c2acdd763224cc071d6a6d0f55a982a1 (patch)
tree2c50191d9018adbe2d058b035d98c50626512ef9 /unpack-trees.c
parentMerge branch 'jc/checkout-merge-base' (diff)
parentt7111: fix bad HEAD in tests with unmerged entries (diff)
downloadtgif-0346e324c2acdd763224cc071d6a6d0f55a982a1.tar.xz
Merge branch 'cc/reset-more'
* cc/reset-more: t7111: fix bad HEAD in tests with unmerged entries
Diffstat (limited to 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions