comparison contrib/hgk @ 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 22f948c027a9
children 0f93bbe8deb7
comparison
equal deleted inserted replaced
13535:0d3cce1de233 13536:fac040b7e822