diff mercurial/templater.py @ 13536:fac040b7e822

merge: drop resolve state for mergers with identical contents (issue2680)
author Matt Mackall <mpm@selenic.com>
date Sat, 05 Mar 2011 16:34:59 -0600
parents e3b87fb34d00
children e798e430c5e5
line wrap: on
line diff