log mercurial/merge.py @ 18426:01638b51df44

age author description
Wed, 12 Dec 2012 02:38:14 +0100 Mads Kiilerich subrepos: process subrepos in sorted order
Tue, 15 Jan 2013 02:59:12 +0100 Mads Kiilerich merge: process files in sorted order
Tue, 15 Jan 2013 01:05:12 +0100 Mads Kiilerich merge: remove "case" comments
Wed, 09 Jan 2013 02:02:45 +0100 Mads Kiilerich merge: merge file flags together with file content
Thu, 10 Jan 2013 03:40:45 +0100 Mads Kiilerich merge: remove old pre-audit code checking for absolute paths
Thu, 10 Jan 2013 00:45:51 +0100 Mads Kiilerich merge: drop reference to file contents immediately after write
Thu, 10 Jan 2013 00:44:23 +0100 Mads Kiilerich merge: changing the mode of a file is also an update