##// END OF EJS Templates
xdiff: remove xmerge related logic...
xdiff: remove xmerge related logic hg has its own merge algorithm with flexible config options. Differential Revision: https://phab.mercurial-scm.org/D2706

File last commit:

r30873:dc22729b stable
r36782:3cf40112 default
Show More
changelog
5 lines | 164 B | text/plain | TextLexer
mercurial (__VERSION__) __CODENAME__; urgency=medium
* Automated build performed by upstream.
-- Mercurial Devel <mercurial-devel@mercurial-scm.org> __DATE__