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

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

mergestate: don't pop stateextras when there are no conflicts on filemerge...
mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148
Gregory Szorc - - Load All Authors

File last commit:

r23399:fd5247a8 default
r47539:1099ca17 default
Show More
hgwebconfig
6 lines | 67 B | text/plain | TextLexer
/ contrib / docker / apache-server / hgwebconfig
History | Annotation | Raw |Copy content |Copy permalink
[paths]
/ = /var/hg/repos/*
[web]
allow_push = *
push_ssl = False