log mercurial/filemerge.py @ 43089:c59eb1560c44

age author description
Sun, 06 Oct 2019 16:55:18 -0400 Gregory Szorc py3: manually import getattr where it is needed
Sun, 06 Oct 2019 13:28:56 -0400 Gregory Szorc py3: manually import pycompat.open into files that need it
Sun, 06 Oct 2019 09:48:39 -0400 Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals
Sun, 06 Oct 2019 09:45:02 -0400 Augie Fackler formatting: blacken the codebase
Thu, 20 Jun 2019 11:40:47 -0700 Kyle Lippincott filemerge: make last line of prompts <40 english chars (issue6158)
Mon, 04 Feb 2019 21:14:37 -0800 Martin von Zweigbergk filemerge: migrate to scmutil.backuppath()
Wed, 30 Jan 2019 12:05:43 -0800 Martin von Zweigbergk merge: respect ui.relative-paths