tree 63b121a1c0f5542bf557330bca3878da51daf232
parent cb48541b99b074458d83f11250dc0370d494f60d
parent 86e8362313331b63e380416de43dd3b6ea660069
author Shawn Pearce <sop@google.com> 1384504388 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1384504389 +0000

Merge "For the 'conflicts' operator return only changes that actually conflict"