Mercurial: tests/test-gendoc-de.t@41ef02ba329b (annotated)

merge: add `--abort` flag which can abort the merge Currently we don't have a good functionality to abort the merge and tell user to do `hg update -C .` which can leads to different results if user missed the '.' and moreover does not align with other abort functionalities like rebase, shelve etc. This patch adds `hg merge --abort` which will abort the ongoing merge and take us back to the chagneset where we started from. Works in both cases when merge resulted in conflicts and when there were no conflicts. .. feature:: A `--abort` flag to merge command to abort the ongoing merge. Differential Revision: https://phab.mercurial-scm.org/D1829

28809 7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests timeless <timeless@mozdev.org> parents: diff changeset	1	#require docutils gettext
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests timeless <timeless@mozdev.org> parents: diff changeset	2
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests timeless <timeless@mozdev.org> parents: diff changeset	3	$ $TESTDIR/check-gendoc de
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests timeless <timeless@mozdev.org> parents: diff changeset	4	checking for parse errors
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests timeless <timeless@mozdev.org> parents: diff changeset	5	Die Dateien werden dem Projektarchiv beim n\xc3\xa4chsten \xc3\x9cbernehmen (commit) hinzugef\xc3\xbcgt. Um dies vorher r\xc3\xbcckg\xc3\xa4ngig zu machen, siehe:hg:`forget`. (esc)
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests timeless <timeless@mozdev.org> parents: diff changeset	6	warning: please have a space before :hg:

author	Pulkit Goyal <7895pulkit@gmail.com>
	Mon, 08 Jan 2018 19:41:47 +0530
changeset 35704	41ef02ba329b
parent 28809	7a1ad08b9ff5
permissions	-rw-r--r--