summaryrefslogtreecommitdiff
path: root/t/lib-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-09 19:24:16 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-09 19:24:16 -0700
commitf7a3276bab880222e3117f8b8cbef40920dfe884 (patch)
tree777beb161c10d03c8185d35fd0ac2a04f06850cb /t/lib-read-tree-m-3way.sh
parentMerge branch 'jc/clean' (diff)
parentcheckout: use --aggressive when running a 3-way merge (-m). (diff)
downloadtgif-f7a3276bab880222e3117f8b8cbef40920dfe884.tar.xz
Merge branch 'fix'
* fix: checkout: use --aggressive when running a 3-way merge (-m). revert/cherry-pick: use aggressive merge.
Diffstat (limited to 't/lib-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions