Mercurial > hgbook
comparison en/examples/tour-merge-conflict.pull.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 | e281bd9a8e47 |
comparison
equal
deleted
inserted
replaced
155:914babdc99c8 | 156:91a936be78b8 |
---|