mergetools / gvimdiff2on commit Merge branch 'jk/rebase-i-comment-char' (00abd71)
   1. "$MERGE_TOOLS_DIR/vimdiff"