log mercurial/merge.py @ 21080:04540a8499a3

age author description
Sun, 06 Apr 2014 13:39:51 +0200 Mads Kiilerich merge: move ancestor selection tweaking from manifestmerge to update function
Sun, 13 Apr 2014 19:01:00 +0200 Mads Kiilerich spelling: fixes from spell checker
Sun, 02 Mar 2014 18:52:16 +0100 Mads Kiilerich merge: keep destination filename as key in filemerge actions