summaryrefslogtreecommitdiff
path: root/test/integration/test-implicit-conflicts-real-not-virtual
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-04-16 11:01:37 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-04-19 01:13:10 +0200
commitf4c7a238f4c29ac9b1e1172f103ab7dec5c5807d (patch)
treef48bd956608c72039bc202567ab65d6317019e57 /test/integration/test-implicit-conflicts-real-not-virtual
parentba6b79bd0090077724fa1272ea4d3a31706fcd5a (diff)
hide first pdiff merge failure debug message
The sibling of this message are all guarded as debug messages, just this one had it missing an subsequently causes display issues if triggered. Git-Dch: Ignore
Diffstat (limited to 'test/integration/test-implicit-conflicts-real-not-virtual')
0 files changed, 0 insertions, 0 deletions