Skip to content
Snippets Groups Projects
user avatar
Siddharth Agarwal authored
This covers two of the four cases of change/delete conflicts -- in an upcoming
patch we'll make :other cover the other two.
63d6bc87
History
Name Last commit Last update
contrib
doc
hgext
i18n
mercurial
tests
.hgignore
.hgsigs
.hgtags
CONTRIBUTORS
COPYING
Makefile
README
hg
hgeditor
hgweb.cgi
setup.py