diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 20:28:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 20:28:33 -0700 |
| commit | 76f38347b4199f65e8c897ebf4f9ce1d3a24378b (patch) | |
| tree | 463e3f8a4ee1f7700ec81caf636d9ec3106e6fc1 /commit.c | |
| parent | git-read-tree: be a lot more careful about merging dirty trees (diff) | |
| download | git-76f38347b4199f65e8c897ebf4f9ce1d3a24378b.tar.gz git-76f38347b4199f65e8c897ebf4f9ce1d3a24378b.zip | |
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.
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions