log mercurial/filemerge.py @ 15738:e86dd8dfdea0

age author description
Wed, 21 Dec 2011 18:20:15 +0100 Laurens Holst context: add isbinary function
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)