##// END OF EJS Templates
merge with stable...
merge with stable There were a handful of merge conflicts in the wire protocol code due to significant refactoring in default. When resolving the conflicts, I tried to produce the minimal number of changes to make the incoming security patches work with the new code. I will send some follow-up commits to get the security patches better integrated into default.

File last commit:

r30873:dc22729b stable
r36778:7bf80d9d merge default
Show More
changelog
5 lines | 164 B | text/plain | TextLexer
Sean Farley
builddeb: use the os codename instead of 'unstable'...
r28989 mercurial (__VERSION__) __CODENAME__; urgency=medium
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
r26148
* Automated build performed by upstream.
av6
debian: update mailing list address
r30873 -- Mercurial Devel <mercurial-devel@mercurial-scm.org> __DATE__