Mercurial > hgbook
diff en/examples/tour-merge-conflict.cousin.out @ 208:a239cd51dcd3
Note "branches" keyword for templates.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 25 Apr 2007 11:04:36 -0700 |
parents | 006bbad1f190 |
children | e281bd9a8e47 |