| commit | da81688cc5639c9c482a89a4b732737f7aa0d61d | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Mon, 6 Apr 2009 08:31:16 +0000 (6 01:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Apr 2009 05:19:55 +0000 (7 22:19 -0700) | ||
| tree | 6f1e0ae58e0f60c199f84c5e9459021b96d5bb73 | treesnapshot (tar.gz zip) |
| parent | 982962ce24c7d614d94f40de54cfcfdf71dcb0d2 | commitdiff |
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>
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-config.txt | diffblobblamehistory |