mergetools / gvimdiff2on commit Merge branch 'jk/tempfile-ferror-fclose-confusion' (c5b22b8)
   1. "$MERGE_TOOLS_DIR/vimdiff"