log mercurial/filemerge.py @ 22027:b98e5c7afc70

age author description
Tue, 05 Aug 2014 15:09:54 -0700 Pierre-Yves David internal:merge: update documentation