summaryrefslogtreecommitdiff
path: root/t/t3700-add.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-08-15 15:45:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-08-15 21:36:37 -0700
commitf34f2b0b384b42f7a0d0d92966c145b05fe55217 (patch)
tree60df5a49c8dad4e4e8b96e719d90c8f4e09aff31 /t/t3700-add.sh
parentpath-list.c: always free strdup'ed paths (diff)
downloadtgif-f34f2b0b384b42f7a0d0d92966c145b05fe55217.tar.xz
Fix read-tree merging more than 3 trees using 3-way merge
For multi-base merges, we allowed read-tree -m to take more than three trees (the last two are our and their branches, and all the earlier ones, typically one but potentially more, are used as the merge base). Unfortunately, the conversion done by commit 933bf40 broke this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3700-add.sh')
0 files changed, 0 insertions, 0 deletions