Mercurial > hg

diff tests/test-rename-merge2.t @ 26899:5f88e092f82c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: don't abort when file is missing A file being missing is a completely valid situation in which the user may want to re-resolve merge conflicts. Mercurial already maintains backups of local data, so this turns out to be easy to handle.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 10 Nov 2015 17:16:59 -0800
parents 8e6d5b7317e6
children d16d73173fdd
line wrap: on
line diff