Mercurial > hg

view tests/test-simplemerge.py.out @ 26519:48476c6129a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: run symlink check for :merge3 Just like :merge, :merge3 doesn't support merging symlinks.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 00:27:23 -0700
parents f18830651811
children
line wrap: on
line source

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

OK