mergetools / vimdiff3on commit Merge branch 'ss/howto-manage-trunk' (75866e6)
   1. "$MERGE_TOOLS_DIR/vimdiff"