Mercurial > hg

diff tests/test-merge-commit.t @ 26893:19c4b93cb7d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: move :merge-local/other symlink check to precheck In upcoming patches we're going to add more checks to the function currently named _symlinkcheck. This consolidates all those checks.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 08 Nov 2015 23:42:44 -0800
parents 8e6d5b7317e6
children 296d55def9c4
line wrap: on
line diff