log contrib/simplemerge @ 31644:f80d9ddc40f3

age author description
Tue, 06 Dec 2016 06:27:58 +0530 Pulkit Goyal fancyopts: switch from fancyopts.getopt.* to getopt.*
Sat, 22 Oct 2016 14:35:10 +0900 Yuya Nishihara ui: factor out ui.load() to create a ui without loading configs (API)
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
Sun, 12 Oct 2008 19:11:59 +0200 Patrick Mezard tests: Windows compatibility fixes
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: move the bulk of simplemerge into core
Tue, 07 Aug 2007 10:24:33 +0200 Thomas Arendsen Hein Remove trailing spaces
Sun, 06 May 2007 16:40:53 +0200 Patrick Mezard simplemerge: flush stdout before writing to stderr.
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho polish the simplemerge command; add a test
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho actually port simplemerge to hg
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho Import 3-way merge code from bzr