mergetools / gvimdiff2on commit Merge branch 'jc/check-attr-honor-working-tree' (28b6821)
   1. "$MERGE_TOOLS_DIR/vimdiff"