| commit | 8610d49e2ca709841be4ece915095ee9f18009fc | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Fri Nov 15 08:33:08 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 15 08:33:09 2013 +0000 |
| tree | 63b121a1c0f5542bf557330bca3878da51daf232 | |
| parent | cb48541b99b074458d83f11250dc0370d494f60d [diff] | |
| parent | 86e8362313331b63e380416de43dd3b6ea660069 [diff] |
Merge "For the 'conflicts' operator return only changes that actually conflict"