Mercurial > hg

diff tests/test-merge-tools.t @ 23263:dd51abf0aa17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: use a try/except ladder instead of looking for a specific version This ensures we get json instead of simplejson in as many places as possible.
author Augie Fackler <raf@durin42.com>
date Mon, 10 Nov 2014 13:20:56 -0500
parents 38e0363dcbe0
children 9d0b6ef92eb2
line wrap: on
line diff