projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 982962c) | patch
doc/merge-config: list ecmerge as a built-in merge tool
authorMarkus Heidelberg <markus.heidelberg@web.de>
Mon, 6 Apr 2009 08:31:16 +0000 (01:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 05:19:55 +0000 (22:19 -0700)
commitda81688cc5639c9c482a89a4b732737f7aa0d61d
tree6f1e0ae58e0f60c199f84c5e9459021b96d5bb73tree | snapshot
parent982962ce24c7d614d94f40de54cfcfdf71dcb0d2commit | diff
doc/merge-config: list ecmerge as a built-in merge tool

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-config.txt diff | blob | history
Git—the stupid content tracker