Remove bogus dup commit warning with --merge-order
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 29 Jun 2005 18:40:58 +0000 (11:40 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 29 Jun 2005 18:40:58 +0000 (11:40 -0700)
commitad6ce07c44c8f76599d506d38cc3194e886e694a
treed118ff95b336ed3ef07094dbbdec754574a5ddbf
parent36f8d17445087a59d81963520ded982e03dfb6cb
Remove bogus dup commit warning with --merge-order

It makes gitk unhappy, and besides, non-merge-order doesn't complain, so
why do it here..
epoch.c