diff hgext/inhibit.py @ 1566:25254b2f8116

evolve: apply API change to 'merge.update' Mercurial core43c00ca887d1 (future 3.7) changed the signature of the 'mercurial.merge.update', this impact our code so we update it. This
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 17 Dec 2015 16:00:32 +0000
parents 42c30774e63d
children aa42a6ad9c5c
line wrap: on
line diff