summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-21 16:32:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-21 16:33:20 -0700
commit8fbf879ed75b67417b0e36eb7b03b79611f1f8a0 (patch)
tree268336d6e6f2d068cb4f24ffc88d15490c8f68fe /t/t7605-merge-resolve.sh
parenttest-lib.sh: Help test_create_repo() find the templates dir (diff)
downloadtgif-8fbf879ed75b67417b0e36eb7b03b79611f1f8a0.tar.xz
Revert "stat_tracking_info(): only count real commits"
This reverts commit 19de5d6913b9681d2bde533bccc8445c9236a648. It produces a misleading output to decide if a merge can fast-forward.
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions