diff mercurial/simplemerge.py @ 13869:b470894c33f8

date: fixup breakage from ">" fix
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 09:39:22 -0500
parents 4cdaf1adafc8
children d13913355390 3c65cdcf3ba6
line wrap: on
line diff