Mercurial > hg

log mercurial/merge.py @ 18540:139529b0a191

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -7 tip
age author description
Thu, 24 Jan 2013 23:57:44 +0100 Mads Kiilerich merge: make all action tuples have the same length - keep args as tuple
Thu, 24 Jan 2013 23:57:44 +0100 Mads Kiilerich merge: delay prompts a bit and show them in (extra) sorted order
Wed, 30 Jan 2013 19:29:36 +0100 Mads Kiilerich merge: fix UnboundLocalError (issue3791) stable
Sun, 20 Jan 2013 17:18:00 -0600 Matt Mackall merge: only sort manifests in debug mode (issue3769) stable
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
less more | (0) -300 -100 -30 -10 -7 tip