log mercurial/hg.py @ 349:b2293093b89e

age author description
Wed, 15 Jun 2005 08:32:29 +0100 Thomas Arendsen Hein Merged with mercurial-identify (which includes upstream's current tip)
Wed, 15 Jun 2005 00:27:20 -0800 mpm merge3: fix argument order
Wed, 15 Jun 2005 00:09:19 -0800 mpm Fix yet another resolve corner case