mergetools / gvimdiff3on commit Merge branch 'jh/empty-notes' (ee443cf)
   1. "$MERGE_TOOLS_DIR/vimdiff"