##// 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.
Mads Kiilerich - - Load All Authors

File last commit:

r16498:d76ba209 stable
r27025:ec372573 default
Show More
test-filelog.py.out
2 lines | 86 B | text/plain | TextLexer
/ tests / test-filelog.py.out
History | Annotation | Raw |Copy content |Copy permalink
ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n
OK.