Ignore:
Timestamp:
Aug 14, 2017, 2:07:34 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
6cfe8bb
Parents:
36a5a77 (diff), bd46af4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into references

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/tests/pybin/tools.py

    r36a5a77 r8217e8f  
    8585                                "--unchanged-group-format='%%=' \\"
    8686                                "--changed-group-format='\t\texpected :\n"
    87                                 "%%<\n"
     87                                "%%<"
    8888                                "\t\tgot :\n"
    89                                 "%%>' \\\n"
     89                                "%%>\n' \\\n"
    9090                                "--new-line-format='\t\t%%dn\t%%L' \\\n"
    9191                                "--old-line-format='\t\t%%dn\t%%L' \\\n"
     
    9494
    9595        # fetch return code and error from the diff command
    96         return sh(diff_cmd % (lhs, rhs), dry_run, False)       
     96        return sh(diff_cmd % (lhs, rhs), dry_run, False)
Note: See TracChangeset for help on using the changeset viewer.