diff mercurial/filemerge.py @ 6130:516d8ffede7c

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sat, 16 Feb 2008 12:46:28 +0100
parents 0ee885fea464
children f89fd07fc51d
line wrap: on
line diff