log mercurial/tagmerge.py @ 36920:6ff6e1d6b5b8

age author description
Sun, 04 Mar 2018 16:23:10 -0500 Yuya Nishihara py3: work around comparison between int and None in tagmerge
Sun, 04 Mar 2018 16:13:46 -0500 Yuya Nishihara py3: do not mutate dict while iterating in tagmerge
Tue, 11 Jul 2017 16:48:15 -0700 Phil Cohen tagmerge: use workingfilectx to write merged tags
Wed, 15 Mar 2017 00:28:58 -0700 Pierre-Yves David tagmerge: use 'wvfs' instead of 'wfile'
Sat, 08 Aug 2015 20:10:46 -0700 Gregory Szorc tagmerge: use absolute_import
Thu, 17 Apr 2014 22:47:38 +0200 Mads Kiilerich spelling: fixes from proofreading of spell checker issues
Fri, 15 Aug 2014 16:20:47 +0200 Mads Kiilerich cleanup: avoid local vars shadowing imports
Thu, 26 Jun 2014 01:20:25 +0200 Angel Ezquerra filemerge: add internal:tagmerge merge tool