mergetools / gvimdiff3on commit Merge branch 'ak/commit-only-allow-empty' (3aead1c)
   1. "$MERGE_TOOLS_DIR/vimdiff"