Mercurial > hg

diff tests/test-simplemerge.py.out @ 27655:af13eaf9ab8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add a new 'backup' argument to get actions We're going to use this in an upcoming patch to back untracked files up when they're replaced by tracked ones.
author Siddharth Agarwal <sid0@fb.com>
date Sat, 02 Jan 2016 03:02:57 -0800
parents f18830651811
children
line wrap: on
line diff