mercurial/__init__.py
author Matt Mackall <mpm@selenic.com>
Thu, 25 Jun 2015 17:54:55 -0500
changeset 25844 18541e9510c5
parent 0 9117c6561b0b
child 27220 4374d819ccd5
permissions -rw-r--r--
merge: make merge.preferancestor type and default consistent (and mark it)