mergetools / gvimdiff2on commit Merge branch 'ls/clean-smudge-override-in-config' (a3764e7)
   1. "$MERGE_TOOLS_DIR/vimdiff"