diff mercurial/merge.py @ 2895:41f8b041893b

Adjusted test to changed help output.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 15 Aug 2006 11:47:17 +0200
parents 3d6efcbbd1c9
children bee4b7abcb01
line wrap: on
line diff