diff mercurial/filemerge.py @ 7027:ab57069232b4

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 10 Sep 2008 23:20:04 +0200
parents f67d1468ac50
children 4c92d8971809
line wrap: on
line diff