comparison hgext/extdiff.py @ 44344:ab632e27f296

tests: add `hg log -G` output when there are merge conflicts The next commit will change the behavior for these. I've used slightly different commands in the different tests to match the surrounding style. Differential Revision: https://phab.mercurial-scm.org/D8042
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 29 Jan 2020 14:42:54 -0800
parents 765a9c299c44
children aac816f584ad
comparison
equal deleted inserted replaced
44343:8561ad49915d 44344:ab632e27f296