diff contrib/simplemerge @ 16051:2aa5b51f310f stable 2.1

phases: don't complain if cset is already public on pushkey (issue3230)
author Matt Mackall <mpm@selenic.com>
date Wed, 01 Feb 2012 14:17:26 -0600
parents 659f34b833b9
children cba222f01056
line wrap: on
line diff