log contrib/simplemerge @ 29243:28dc0030228a

age author description
Wed, 10 Feb 2016 22:44:29 +0900 FUJIWARA Katsunori misc: use modern exception syntax
Thu, 08 Oct 2015 12:55:45 -0700 Pierre-Yves David error: get Abort from 'error' instead of 'util'
Tue, 05 Aug 2014 14:56:25 -0700 Pierre-Yves David simplemerge: burn "minimal" feature to the ground
Mon, 01 Jul 2013 20:48:56 +0200 Simon Heimberg cleanup: drop unused variables and an unused import
Wed, 17 Apr 2013 03:39:36 +0200 Mads Kiilerich tests: run check-code on Python files without .py extension
Fri, 06 May 2011 15:25:35 +0200 Adrian Buehlmann rename util.set_binary to setbinary
Thu, 30 Apr 2009 23:57:36 -0500 Steve Borho simplemerge: use ui.warn() for warnings