diff options
| author | Johann <johannkoenig@google.com> | 2014-02-04 15:56:17 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-04 15:56:17 -0800 |
| commit | ec285c48d90d139cbd8a6d0fc6424dbf843e55e9 (patch) | |
| tree | 667baa2a8a7a0a644d72e0aaafb66c36015f0324 | |
| parent | c31cf0d647fe967649c75f31ebbac5882037075c (diff) | |
| parent | f498d92ff4686c2b1bfba87b3e44987ef87a66e7 (diff) | |
| download | libvpx-ec285c48d90d139cbd8a6d0fc6424dbf843e55e9.tar libvpx-ec285c48d90d139cbd8a6d0fc6424dbf843e55e9.tar.gz libvpx-ec285c48d90d139cbd8a6d0fc6424dbf843e55e9.tar.bz2 libvpx-ec285c48d90d139cbd8a6d0fc6424dbf843e55e9.zip | |
Merge "Ignore missing newline message"
| -rw-r--r-- | tools/diff.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/diff.py b/tools/diff.py index a42a4dc7c..a96c7db85 100644 --- a/tools/diff.py +++ b/tools/diff.py @@ -56,6 +56,9 @@ class DiffHunk(object): elif line[0] == " ": self.left.Append(line) self.right.Append(line) + elif line[0] == "\\": + # Ignore newline messages from git diff. + pass else: assert False, ("Unrecognized character at start of diff line " "%r" % line[0]) |