Mercurial > hg

view tests/test-symlink-os-yes-fs-no.py.out @ 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 ca6cebd8734e
children eb586ed5d8ce
line wrap: on
line source

requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved