mergetools / gvimdiffon commit Merge branch 'jc/check-attr-honor-working-tree' into maint (a8b3131)
   1. "$MERGE_TOOLS_DIR/vimdiff"