##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

resolve: fix incorrect merge...
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.
Martin Geisler - - Load All Authors

File last commit:

r11769:ca6cebd8 stable
r27025:ec372573 default
Show More
test-symlink-os-yes-fs-no.py.out
14 lines | 438 B | text/plain | TextLexer
/ tests / test-symlink-os-yes-fs-no.py.out
History | Annotation | Raw |Copy content |Copy permalink
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