LGTM=dave
R=golang-codereviews, dave
CC=golang-codereviews
https://golang.org/cl/
109080048
When this happens, Mercurial leaves both edits in the file,
marked by <code><<<<<<<</code> and
<code>>>>>>>></code>.
-it is now your job to edit the file to combine them.
+It is now your job to edit the file to combine them.
Continuing the example, searching for those strings in <code>flag_test.go</code>
might turn up:
</p>