# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1224698740 18000
# Node ID 65f14ca8d2eb58f94b0152121d997fe4a199bb15
# Parent  acb87c5b4aeba0a5e16dfe53953dd8fc50956146
chmod -x simplemerge.py

diff -r acb87c5b4aeb -r 65f14ca8d2eb mercurial/simplemerge.py