Mercurial > hg

view tests/test-simplemerge.py.out @ 27075:6373330155b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate._resolve: don't return the action any more This is a partial backout of an earlier diff -- now that we're storing the results in a dict, we don't actually need this any more.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 20 Nov 2015 16:32:47 -0800
parents f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK