log mercurial/merge.py @ 18331:e68cec5e28b0

age author description
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
Wed, 26 Dec 2012 14:50:17 -0800 Siddharth Agarwal copies: separate moves via directory renames from explicit copies
Thu, 06 Dec 2012 22:07:44 -0600 Kevin Bullock merge: fix mistake in moved _checkcollision call from 5881d5b7552f
Tue, 04 Dec 2012 12:54:18 -0800 David Schleimer merge: support calculating merge actions against non-working contexts
Tue, 04 Dec 2012 12:54:18 -0800 David Schleimer merge: refactor action calculation into function
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