diff mercurial/simplemerge.py @ 14128:0386b51dd749

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 01 May 2011 06:06:59 -0500
parents d13913355390
children abaacdab38f6
line wrap: on
line diff