mergetools / gvimdiff2on commit Merge branch 'jk/http-auth' (92718f5)
   1. "$MERGE_TOOLS_DIR/vimdiff"