mergetools / gvimdiff3on commit Merge branch 'jk/rerere-forget-check-enabled' (c37d7b5)
   1. "$MERGE_TOOLS_DIR/vimdiff"