comparison tests/failfilemerge.py @ 29583:6ce870dba6fa

run-tests: make --local set --with-chg if --chg is used --local should work with chg as well.
author Jun Wu <quark@fb.com>
date Mon, 18 Jul 2016 08:55:30 +0100
parents 424c1632fffb
children a7f8939641aa
comparison
equal deleted inserted replaced
29582:ee96d95e81a4 29583:6ce870dba6fa