view en/examples/backout.init.out @ 156:91a936be78b8

Document merge behaviour with file names.

$ \textbf{hg init myrepo}
$ \textbf{cd myrepo}
$ \textbf{echo first change >> myfile}
$ \textbf{hg add myfile}
$ \textbf{hg commit -m 'first change'}
$ \textbf{echo second change >> myfile}
$ \textbf{hg commit -m 'second change'}