mergetools / gvimdiff2on commit Merge branch 'jk/coding-guidelines-update' into maint (63f1bb8)
   1. "$MERGE_TOOLS_DIR/vimdiff"