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