diff options
| author | Markus Heidelberg <markus.heidelberg@web.de> | 2009-04-06 12:31:16 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-08 09:19:55 +0400 |
| commit | da81688cc5639c9c482a89a4b732737f7aa0d61d (patch) | |
| tree | 6f1e0ae58e0f60c199f84c5e9459021b96d5bb73 /git-mergetool.sh | |
| parent | 982962ce24c7d614d94f40de54cfcfdf71dcb0d2 (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>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions