contrib/plan9/proto
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Tue, 14 Aug 2018 20:05:36 +0900
changeset 39158 7c6044634957
parent 16489 cf137319c6cd
permissions -rw-r--r--
help: describe more detail about capabilities while deciding merge tool "hg help merge-tools" describes as below: (internal merge tools) will by default not handle symlinks or binary files. But in some cases, Mercurial assumes that internal merge tools have one or both of these capabilities. "hg help merge-tools" also describes as below, for matching patterns in merge-patterns configuration section. But this is not sufficient. Here, binary capabilities of the merge tool are not considered. This patch describes more detail about capabilities while deciding merge tool.

lib	- sys sys
	mercurial	- sys sys
		hgrc.d	- sys sys
			9diff.rc	- sys sys
			factotum.rc	- sys sys
rc	- sys sys
	bin	- sys sys
		9diff	- sys sys
		hg	- sys sys
sys	- sys sys
	lib	- sys sys
		python	- sys sys
			lib	- sys sys
				python2.5	- sys sys
					site-packages	- sys sys
						hgext	- sys sys
							+	- sys sys
						mercurial	- sys sys
							+	- sys sys
						mercurial-VERSION-py2.5.egg-info	- sys sys
	src	- sys sys
		cmd	- sys sys
			hg	- sys sys
				+	- sys sys