Mercurial > hg

diff mercurial/merge.py @ 24980:2dadd81c68fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: when building json, use result.failures instead of result.faildata It is unclear to me why 'faildata' was used. Let's use the same kind of attribute as for the other groups.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 07 May 2015 23:20:24 -0700
parents 51844b8b5017
children 6eb4bdad198f
line wrap: on
line diff