Mercurial > hg

diff mercurial/tagmerge.py @ 23477:689540e6007e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: add tests for untracked local file We don't seem to have any tests for updating to another revision when there are untracked files on the local side that conflict with the those on the remote side, so let's add tests. This shows how we overwrite untracked ignored files when updating to a revision that tracks the file.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 02 Dec 2014 17:11:01 -0800
parents b27c3beaaf30
children e53f6b72a0e4
line wrap: on
line diff