diff mercurial/simplemerge.py @ 9435:aa92ce9586d8

Merge with crew-stable
author Martin Geisler <mg@lazybytes.net>
date Thu, 10 Sep 2009 10:31:12 +0200
parents b87a50b7125c
children 08a0f04b56bd
line wrap: on
line diff