mergetools / gvimdiff2on commit Merge branch 'jn/config-ignore-inaccessible' into maint (b1c418e)
   1. "$MERGE_TOOLS_DIR/vimdiff"