Mercurial > public > mercurial-scm > hg-stable

log mercurial/merge.py @ 18426:01638b51df44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -14 tip
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
Tue, 15 Jan 2013 01:05:12 +0100 Mads Kiilerich merge: use util.unlinkpath for removing moved files
Tue, 15 Jan 2013 01:05:12 +0100 Mads Kiilerich merge: .hgsubstate is special as merge destination, not as merge source
Wed, 09 Jan 2013 00:01:33 +0100 Mads Kiilerich merge: remove redundant unlink after merge
Wed, 09 Jan 2013 00:01:33 +0100 Mads Kiilerich merge: rename list of actions from action to actions
Wed, 09 Jan 2013 00:01:33 +0100 Mads Kiilerich merge: consistently use "x" instead of 'x' for internal action types
Wed, 09 Jan 2013 00:01:33 +0100 Mads Kiilerich merge: consistently use repo.wopener.audit instead of creating a new auditor
Fri, 28 Dec 2012 11:55:57 +0100 Mads Kiilerich util: fold ENOENT check into unlinkpath, controlled by new ignoremissing flag
less more | (0) -300 -100 -14 tip