log mercurial/filemerge.py @ 16254:c7eef052c9e3 stable

age author description
Tue, 13 Mar 2012 15:12:26 -0500 Matt Mackall filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 stable
Thu, 01 Mar 2012 17:45:13 +0100 Thomas Arendsen Hein merge with stable
Thu, 01 Mar 2012 17:35:12 +0100 Thomas Arendsen Hein filemerge: remove temporary files when using internal:dump as merge-tool stable
Thu, 16 Feb 2012 15:58:51 -0600 Matt Mackall filemerge: remove some redundancy in decorators/docstrings