| commit | f34f2b0b384b42f7a0d0d92966c145b05fe55217 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Aug 2007 22:45:10 +0000 (15 15:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Aug 2007 04:36:37 +0000 (15 21:36 -0700) | ||
| tree | 60df5a49c8dad4e4e8b96e719d90c8f4e09aff31 | treesnapshot (tar.gz zip) |
| parent | 79d722224dbad49a50072f92f823d8b12c2e5707 | commitdiff |
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>
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>
| builtin-read-tree.c | diffblobblamehistory |