mergetools / gvimdiffon commit Merge branch 'sb/checkout-test-complex-path' (774282d)
   1. "$MERGE_TOOLS_DIR/vimdiff"