mergetools / gvimdiff3on commit Merge branch 'jk/rev-list-has-no-notes' (0bb71fb)
   1. "$MERGE_TOOLS_DIR/vimdiff"