summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-06-13 19:19:48 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-13 11:49:41 -0700
commit5a092ceb6b285e8377add13d460850668fd0d13c (patch)
treeb809240d61d5a152897ef124f76b4e4e4697f329 /t/t6037-merge-ours-theirs.sh
parentread-tree: force split-index mode off on --index-output (diff)
downloadtgif-5a092ceb6b285e8377add13d460850668fd0d13c.tar.xz
read-tree: note about dropping split-index mode or index version
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions