| commit | 76f38347b4199f65e8c897ebf4f9ce1d3a24378b | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 6 Jun 2005 03:28:33 +0000 (5 20:28 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 6 Jun 2005 03:28:33 +0000 (5 20:28 -0700) | ||
| tree | 463e3f8a4ee1f7700ec81caf636d9ec3106e6fc1 | treesnapshot (tar.gz zip) |
| parent | 02ede67ad45973f9f8d07db7896a537de97d21b6 | commitdiff |
git-read-tree: fix up three-way merge tests
When we collapse three entries, we need to check all of the
collapsed entries against the old pre-merge state.
When we collapse three entries, we need to check all of the
collapsed entries against the old pre-merge state.
| read-tree.c | diffblobblamehistory |