mergetools / gvimdiffon commit Merge branch 'bc/hash-independent-tests' (9472b13)
   1. "$MERGE_TOOLS_DIR/vimdiff"