diff tests/test-mq-qpush-fail.t @ 18337:557c8522aec0

tests: better test coverage of merges of flags This makes existing problems with merges of symlinks and files more obvious and add test coverage for tricky merges without real common ancestors.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:12 +0100
parents 46cc3b74e1c5
children fd0f0b0d316d
line wrap: on
line diff