mergetools / vimdiff3on commit Merge branch 'rl/am-3way-config' (4b64c8a)
   1. "$MERGE_TOOLS_DIR/vimdiff"