| commit | 7ee5b02494aadbe53e5a50f085ce0c81908b5781 | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Sun, 5 Apr 2009 12:42:27 +0000 (5 14:42 +0200) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 5 Apr 2009 13:21:27 +0000 (5 15:21 +0200) | ||
| tree | 63fb6de391370f5be8c450a06c018bd646ae2333 | treesnapshot (tar.gz zip) |
| parent | f7512386097c4f20e3c147e5de8888e49e4835c5 | commitdiff |
doc/merge-config: list ecmerge as a built-in merge tool
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
| Documentation/merge-config.txt | diffblobblamehistory |