summaryrefslogtreecommitdiff
path: root/t/t6032-merge-large-rename.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-15 22:51:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-15 22:51:15 -0700
commit86c340e08287c0faad8871207787e5819f22a7d5 (patch)
treeee05a1f8d8fdf038e385de68ecc107793c123eb5 /t/t6032-merge-large-rename.sh
parentMerge branch 'jc/commit-hook-authorship' (diff)
parentxdiff: PATIENCE/HISTOGRAM are not independent option bits (diff)
downloadtgif-86c340e08287c0faad8871207787e5819f22a7d5.tar.xz
Merge branch 'jc/diff-algo-cleanup'
Resurrects the preparatory clean-up patches from another topic that was discarded, as this would give a saner foundation to build on diff.algo configuration option series. * jc/diff-algo-cleanup: xdiff: PATIENCE/HISTOGRAM are not independent option bits xdiff: remove XDL_PATCH_* macros
Diffstat (limited to 't/t6032-merge-large-rename.sh')
0 files changed, 0 insertions, 0 deletions