From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 6 Jun 2005 06:32:53 +0000 (-0700)
Subject: Three-way merge: fix silly bug that made trivial merges not work
X-Git-Tag: v0.99~344
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a76d74fb7146d1785cdefc58a91c50ab9acec775?hp=a76d74fb7146d1785cdefc58a91c50ab9acec775

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.
---