diff mercurial/simplemerge.py @ 7209:65f14ca8d2eb

chmod -x simplemerge.py
author Matt Mackall <mpm@selenic.com>
date Wed, 22 Oct 2008 13:05:40 -0500
parents e75aab656f46
children 810ca383da9c
line wrap: on
line diff