log contrib/simplemerge @ 45067:9a062913bab6

age author description
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)