tests/test-check-config.t
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 09 Feb 2017 09:32:25 -0800
changeset 30927 4d019d0e1b3b
parent 29219 3c9066ed557c
child 32864 7c11869cf23a
permissions -rw-r--r--
merge: print status message before launching external merge tool It seems somewhat common that people run into a merge conflict and don't notice the launched merge tool, and instead they think hg just hung. Let's print a message for each file that we launch a GUI merge tool for.

#require test-repo

  $ . "$TESTDIR/helpers-testrepo.sh"
  $ cd "$TESTDIR"/..

New errors are not allowed. Warnings are strongly discouraged.

  $ hg files "set:(**.py or **.txt) - tests/**" | sed 's|\\|/|g' |
  >   python contrib/check-config.py