Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 42672:51a2e3102db2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -6 tip
age author description
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
Thu, 17 Jan 2019 09:17:12 -0800 Martin von Zweigbergk cleanup: delete lots of unused local variables
Sat, 13 Oct 2018 07:49:20 -0700 Kyle Lippincott merge-tools: when calling external merge tool, describe the resolve inputs
Wed, 29 Aug 2018 22:53:44 -0400 Matt Harbison filemerge: fix an i18n comment typo
less more | (0) -100 -30 -10 -6 tip