diff mercurial/merge.py @ 4241:7c59ade0f0d6

hg qseries -m: guards file was not ignored
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 18 Mar 2007 20:37:47 +0100
parents 7e1c8a565a4f
children dbc3846c09a1 4787e2b0dd03
line wrap: on
line diff