log mercurial/merge.py @ 20652:2a4871c2511d

age author description
Wed, 05 Mar 2014 10:49:43 -0800 Pierre-Yves David merge: adds documentation to the mergestate class