diff mercurial/simplemerge.py @ 13740:dcb51f156fa6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Mar 2011 12:38:36 -0500
parents 4cdaf1adafc8
children d13913355390 3c65cdcf3ba6
line wrap: on
line diff