view tests/missing-comment.hg @ 26899:5f88e092f82c

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 168cc52ad7c2
children
line wrap: on
line source

(binary:application/octet-stream)