hg merge binary, resolving one conflict by choosing left (new 0.17 version)
authorTim Bunce <Tim.Bunce@pobox.com>
Thu, 28 Feb 2008 20:27:44 +0000 (20:27 +0000)
committerTim Bunce <Tim.Bunce@pobox.com>
Thu, 28 Feb 2008 20:27:44 +0000 (20:27 +0000)

Trivial merge