Mercurial > hg-stable

diff tests/test-merge-criss-cross.t @ 22579:36a940d82f88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: protect the run-tests.py --json test behind an hghave rule We add a rules to detect availability of a json module and skip if json is not available.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 18 Sep 2014 11:43:47 -0700
parents 17011b36aac7
children 5220c12c43fd
line wrap: on
line diff