summaryrefslogtreecommitdiff
path: root/epoch.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 06:32:53 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 06:32:53 (GMT)
commita76d74fb7146d1785cdefc58a91c50ab9acec775 (patch)
tree12023d513724ec1d3b4f2faddb4206b48afa2a2b /epoch.h
parent6ee67f2610d0060bee45eee0b83fe42143441589 (diff)
downloadgit-a76d74fb7146d1785cdefc58a91c50ab9acec775.zip
git-a76d74fb7146d1785cdefc58a91c50ab9acec775.tar.gz
git-a76d74fb7146d1785cdefc58a91c50ab9acec775.tar.bz2
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 'epoch.h')
0 files changed, 0 insertions, 0 deletions