| commit | a76d74fb7146d1785cdefc58a91c50ab9acec775 | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 6 Jun 2005 06:32:53 +0000 (5 23:32 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 6 Jun 2005 06:32:53 +0000 (5 23:32 -0700) | ||
| tree | 12023d513724ec1d3b4f2faddb4206b48afa2a2b | treesnapshot (tar.gz zip) |
| parent | 6ee67f2610d0060bee45eee0b83fe42143441589 | commitdiff |
Three-way merge: fix silly bug that made trivial merges not work
Making the main loop look more like the one- and two-way cases
introduced a bug where "src" had been updated early, but later
users hadn't been adjusted to match.
Making the main loop look more like the one- and two-way cases
introduced a bug where "src" had been updated early, but later
users hadn't been adjusted to match.
| read-tree.c | diffblobblamehistory |