view en/examples/tour.commit.out @ 156:91a936be78b8

Document merge behaviour with file names.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 12 Mar 2007 23:11:26 -0700
parents 006bbad1f190
children ef6a1427d0af
line wrap: on
line source

$ \textbf{hg commit}
nothing changed