diff mercurial/merge.py @ 17912:7a3de6c23f6d

tags: add formatter support
author Matt Mackall <mpm@selenic.com>
date Tue, 06 Nov 2012 17:38:22 -0600
parents ce7bc04d863b
children 5881d5b7552f
line wrap: on
line diff