diff mercurial/formatter.py @ 25844:18541e9510c5

merge: make merge.preferancestor type and default consistent (and mark it)
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jun 2015 17:54:55 -0500
parents 31137258ae8b
children 175873e36d03
line wrap: on
line diff