log mercurial/merge.py @ 30060:a145161debed

age author description
Sat, 08 Oct 2016 01:25:28 -0700 Simon Farnsworth merge: use labels in subrepo merge