log mercurial/filemerge.py @ 8615:94ca38e63576

age author description
Sun, 24 May 2009 22:37:20 +0200 Martin Geisler use ui instead of repo.ui when the former is in scope
Sun, 24 May 2009 02:56:14 -0500 Matt Mackall match: add some default args