Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 39277:f785073f792c

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
Mon, 20 Aug 2018 13:29:48 -0400 Augie Fackler merge: improve interactive one-changed one-deleted message (issue5550)
Wed, 22 Aug 2018 14:08:27 +0900 FUJIWARA Katsunori filemerge: avoid putting translated text into docstring
Wed, 22 Aug 2018 13:57:01 +0900 FUJIWARA Katsunori filemerge: make capability check for internal tools ignore merge-tools section
Tue, 14 Aug 2018 22:20:28 +0900 FUJIWARA Katsunori filemerge: show actual capabilities of internal merge tools
Wed, 15 Aug 2018 22:24:50 +0900 FUJIWARA Katsunori filemerge: add config knob to check capabilities of internal merge tools
Wed, 15 Aug 2018 22:24:38 +0900 FUJIWARA Katsunori filemerge: show warning if chosen tool has no binary files capability
less more | (0) -100 -30 -10 -6 tip