log mercurial/help/merge-tools.txt @ 32713:28240b75e880

age author description
Sat, 06 May 2017 02:33:00 +0900 FUJIWARA Katsunori help: describe about choice of :prompt as a fallback merge tool explicitly stable
Sun, 28 Sep 2014 17:15:28 +0200 Mads Kiilerich filemerge: switch the default name for internal tools from internal:x to :x
Wed, 19 Feb 2014 13:25:28 +0100 Simon Heimberg help: remove last occurrences of ".. note::" without two newlines
Wed, 25 Jul 2012 16:40:38 +0900 FUJIWARA Katsunori doc: unify section level between help topics stable
Sun, 12 Feb 2012 21:38:12 +0900 FUJIWARA Katsunori filemerge: create detail of internal merge tools from documentation string
Wed, 27 Oct 2010 12:03:08 -0200 Wagner Bruna help: fix typo in merge-tools topic stable
Mon, 25 Oct 2010 14:34:49 -0500 Steve Borho help: improve wording of internal:merge and internal:fail stable
Sun, 24 Oct 2010 18:37:59 +0200 Patrick Mezard merge-tools.txt: 6 comes after 5 stable
Sun, 24 Oct 2010 12:55:29 +0200 Patrick Mezard merge-tools.txt: fix typos, simplify, renumber from 1. stable
Fri, 22 Oct 2010 17:08:15 +0200 Mads Kiilerich help: improve merge-tools topic, describe --tool and clarify details stable
Thu, 21 Oct 2010 21:34:30 +0200 Martin Geisler merge-tools: fixed typos stable
Wed, 20 Oct 2010 16:54:34 +0200 Erik Zielke help: help topic for merge tools