Mercurial > hgbook
comparison en/examples/rename.divergent.rename.bob.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 | |
children |
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 12 Mar 2007 23:11:26 -0700 |
parents | |
children |