diff .hgignore @ 16355:cb1475e7e5a2 stable

test-merge-types: allow different output with existing hgmerge (issue3346) Because hgmerge was meant to be adjusted to personal needs, there may be many remaining copies in people's $PATH.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 04 Apr 2012 11:18:42 +0200
parents 44a371823f83
children 5068d0974278
line wrap: on
line diff