Mercurial > hg

log mercurial/merge.py @ 16092:914bc95e227b

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, 09 Feb 2012 13:16:20 -0600 Matt Mackall update: use normal update path with --check (issue2450)
Thu, 26 Jan 2012 20:34:57 -0600 Matt Mackall merge: defer symlink flag merging to filemerge (issue3200) stable
Wed, 11 Jan 2012 15:53:42 -0500 Jordi Gutiérrez Hermoso merge: report all files in _checkunknown
Wed, 04 Jan 2012 15:48:02 -0600 Matt Mackall copies: split the copies api for "normal" and merge cases (API)
Fri, 16 Dec 2011 19:05:59 -0600 Matt Mackall merge with stable
Fri, 16 Dec 2011 21:21:27 +0900 FUJIWARA Katsunori merge: check filename case collision between changesets for branch merging stable
Thu, 15 Dec 2011 14:37:36 -0600 Matt Mackall merge with stable
less more | (0) -300 -100 -30 -10 -7 tip