| commit | cfd54d6e200dcce3e6c1401eb0af2b36291c1af8 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Sun Dec 22 18:12:04 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sun Dec 22 18:12:04 2013 +0000 |
| tree | 81fc9b9b04ef84c5e3c25b7adf9b755e889de924 | |
| parent | bf41b7e5e43a66e447b06ede82aca699afe88156 [diff] | |
| parent | b6574c2cc79bd301ab0e92a072146dc0e5df0c3f [diff] |
Merge "Don't wrap "Merge Conflict" in status column"