Merge with -stable
authorMatt Mackall <mpm@selenic.com>
Tue, 09 Oct 2007 17:25:24 -0500
changeset 5441 f9c2917a9f7a
parent 5439 bfbd9b954315 (current diff)
parent 5440 f9b0e4f023c4 (diff)
child 5442 be015f9b7405
Merge with -stable
mercurial/merge.py