commit | 3f7aa28c0c4b78c0489aee3ba954f1b861413931 | [log] [tgz] |
---|---|---|
author | Shawn Pearce <sop@google.com> | Mon Apr 22 17:48:34 2013 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Apr 22 17:48:34 2013 +0000 |
tree | f9a20d31d1d7ee1c2af50e197371af39e46899b1 | |
parent | e43e1f01db29815f20fcf78c309c01589dbd5760 [diff] | |
parent | e8c1fb9a640f9fc39c627f66b122a71d602ec7e5 [diff] |
Merge "Distinguish between error and timeout in intraline diff error message"