Mercurial > hgbook
diff en/examples/backout.manual.merge.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 | 5fc4a45c069f |