mergetools / gvimdiff3on commit Merge branch 'js/smart-http-detect-remote-error' (fd357c4)
   1. "$MERGE_TOOLS_DIR/vimdiff"