diff lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl @ 1485:c8d3ad483bea redmine-2.4-integration

Fix stray merge markers
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 15 Jan 2014 13:34:12 +0000
parents 5e80956cc792
children a1bdbf8a87d5
line wrap: on
line diff