diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 08:32:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 08:32:53 +0200 |
| commit | a76d74fb7146d1785cdefc58a91c50ab9acec775 (patch) | |
| tree | 12023d513724ec1d3b4f2faddb4206b48afa2a2b /Documentation/git-cat-file.txt | |
| parent | Fix entry.c dependency and compile problem (diff) | |
| download | git-a76d74fb7146d1785cdefc58a91c50ab9acec775.tar.xz git-a76d74fb7146d1785cdefc58a91c50ab9acec775.zip | |
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.
Diffstat (limited to 'Documentation/git-cat-file.txt')
0 files changed, 0 insertions, 0 deletions