mergetools / gvimdiff3on commit Merge branch 'nd/status-auto-comment-char' (1e2600d)
   1. "$MERGE_TOOLS_DIR/vimdiff"