log mercurial/merge.py @ 21545:43eecb4e23f8

age author description
Fri, 28 Feb 2014 02:25:58 +0100 Mads Kiilerich merge: use separate lists for each action type