comparison .hgtags @ 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 681f675401ff
children 4bb48b1da1f8
comparison
equal deleted inserted replaced
1565:9590332b26c8 1566:25254b2f8116