Mercurial > hg

view tests/test-simplemerge.py.out @ 21537:1ab30e9ba0fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: specify custom conflict markers for update (BC) Add custom conflict markers 'working copy' and 'destination' for doing hg update when there are conflicts between your working copy and the destination.
author Durham Goode <durham@fb.com>
date Fri, 09 May 2014 18:09:11 -0700
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK