contrib/simplemerge
Thu, 03 Mar 2022 17:34:00 +0100 Gregory Szorc py2: remove simple from __future__ statements
Mon, 07 Feb 2022 14:07:04 -0800 Martin von Zweigbergk simplemerge: remove now-unused arguments
Fri, 14 Jan 2022 08:17:13 -0800 Martin von Zweigbergk simplemerge: move printing of merge result to extension
Thu, 10 Feb 2022 13:36:09 -0800 Martin von Zweigbergk simplemerge: let extension check for binary inputs (unless `--text`)
Thu, 10 Feb 2022 09:59:07 -0800 Martin von Zweigbergk simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments
Thu, 20 Jan 2022 11:00:30 -0800 Martin von Zweigbergk simplemerge: take arguments as annotated context objects
Fri, 07 Jan 2022 23:29:19 -0800 Martin von Zweigbergk simplemerge: move default labels to simplemerge extension
Tue, 14 Dec 2021 13:12:56 -0800 Martin von Zweigbergk simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
Fri, 06 Nov 2020 13:58:59 -0800 Gregory Szorc global: use python3 in shebangs
Mon, 06 Jul 2020 17:44:25 +0200 Manuel Jacob pycompat: change users of pycompat.{stdin,stdout,stderr} to use procutil.std*
Thu, 14 Nov 2019 20:35:11 -0800 Gregory Szorc black: blacken scripts
Fri, 01 Nov 2019 17:23:02 +0100 Emmanuel Leblond py3: fix exception display encoding in contrib/simplemerge.py stable
Sat, 13 Oct 2018 16:57:28 +0200 Yuya Nishihara py3: convert "usage" literal to bytes
Sat, 13 Oct 2018 08:54:44 -0400 Augie Fackler simplemerge: port to Python 3
Mon, 24 Sep 2018 00:00:04 +0300 Pulkit Goyal py3: use pycompat.strkwargs() in contrib/simplemerge
Sun, 23 Sep 2018 23:59:35 +0300 Pulkit Goyal py3: add b'' prefixes in contrib/simplemerge
Sat, 24 Mar 2018 15:10:51 +0900 Yuya Nishihara procutil: bulk-replace function calls to point to new module
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
less more (0) -30 tip