7 Commits

Author	SHA1	Message	Date
Wagner Bruna	0913d409a2	help: fix typo in merge-tools topic	2010-10-27 12:03:08 -02:00
Steve Borho	7b316e89b0	help: improve wording of internal:merge and internal:fail	2010-10-25 14:34:49 -05:00
Patrick Mezard	d96f85f343	merge-tools.txt: 6 comes after 5	2010-10-24 18:37:59 +02:00
Patrick Mezard	90ed7bf6a1	merge-tools.txt: fix typos, simplify, renumber from 1.	2010-10-24 12:55:29 +02:00
Mads Kiilerich	1c09b9028f	help: improve merge-tools topic, describe --tool and clarify details ... This doesn't make it simpler, but it makes it more correct. With help from erikz, mg and abuehl.	2010-10-22 17:08:15 +02:00
Martin Geisler	7e2dd66daa	merge-tools: fixed typos ... Spotted by Patrick Mézard.	2010-10-21 21:34:30 +02:00
Erik Zielke	9ef6ae89b7	help: help topic for merge tools ... I have made a help topic for merge tools. The text in the topic is based on the http://mercurial.selenic.com/wiki/MergeProgram page from the wiki, along with some extra information on the internal merge tools.	2010-10-20 16:54:34 +02:00