log contrib/simplemerge @ 34734:3572b2031cec

age author description
Fri, 01 Sep 2017 11:52:20 -0700 Phil Cohen context: add arbitraryfilectx, which can represent files outside the workdir
Fri, 01 Sep 2017 10:35:43 -0700 Phil Cohen simplemerge: remove unused `filtereddata` parameter
Thu, 24 Aug 2017 21:30:51 -0700 Phil Cohen simplemerge: stop accepting, and passing, file parameters
Thu, 24 Aug 2017 21:30:37 -0700 Phil Cohen contrib: make simplemerge script pass context-like objects
Tue, 22 Aug 2017 14:13:13 -0400 Augie Fackler simplemerge: update to conform with modern import conventions
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