log mercurial/merge.py @ 18010:38b51a60a195

age author description
Wed, 31 Oct 2012 16:50:22 +0900 FUJIWARA Katsunori icasefs: make case-folding collision detection as deletion aware (issue3648) stable
Wed, 23 May 2012 20:50:16 +0200 Thomas Arendsen Hein merge: warn about file deleted in one branch and renamed in other (issue3074)
Sun, 13 May 2012 14:04:04 +0200 Brodie Rao localrepo: add branchtip() method for faster single-branch lookups
Thu, 03 May 2012 15:14:58 +0200 Patrick Mezard rebase: allow collapsing branches in place (issue3111)
Sat, 12 May 2012 15:54:54 +0200 Brodie Rao cleanup: eradicate long lines
Sun, 29 Apr 2012 22:25:55 +0200 Patrick Mezard localrepo: add setparents() to adjust dirstate copies (issue3407) stable
Fri, 27 Apr 2012 13:18:09 -0500 Matt Mackall merge: check for untracked files more precisely (issue3400) stable
Mon, 23 Apr 2012 14:32:59 +0200 Patrick Mezard update: fix case-collision with a clean wd and no --clean stable
Mon, 16 Apr 2012 01:11:29 +0900 FUJIWARA Katsunori icasefs: make case-folding collision detection as rename aware (issue3370) stable
Mon, 26 Mar 2012 16:41:54 -0500 Matt Mackall merge: fix unknown file merge detection for case-folding systems
Thu, 15 Mar 2012 13:11:42 -0500 Matt Mackall merge with stable
Wed, 14 Mar 2012 14:45:41 -0500 Matt Mackall merge: accept missing revisions in symlink flag merge (issue3316) stable
Tue, 13 Mar 2012 16:29:13 -0500 Matt Mackall merge with stable
Tue, 13 Mar 2012 16:28:08 -0500 Matt Mackall merge: handle linear update to symlink correctly (issue3316) stable
Sat, 25 Feb 2012 14:22:58 -0600 Matt Mackall copies: remove checkdirs options