git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 982962c)

author	Markus Heidelberg <redacted>
	Mon, 6 Apr 2009 08:31:16 +0000 (01:31 -0700)
committer	Junio C Hamano <redacted>
	Wed, 8 Apr 2009 05:19:55 +0000 (22:19 -0700)
commit	da81688cc5639c9c482a89a4b732737f7aa0d61d
tree	6f1e0ae58e0f60c199f84c5e9459021b96d5bb73	tree \| snapshot
parent	982962ce24c7d614d94f40de54cfcfdf71dcb0d2	commit \| diff

doc/merge-config: list ecmerge as a built-in merge tool

Signed-off-by: Markus Heidelberg <redacted>
Signed-off-by: Junio C Hamano <redacted>

Documentation/merge-config.txt

diff | blob | history

git clone https://git.99rst.org/PROJECT