view en/examples/backout.manual.parents.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 e0b56f008b09
line wrap: on
line source

$ \textbf{hg parents}
changeset:   
tag:         tip
parent:      
user:        Bryan O'Sullivan <bos@serpentine.com>

summary:     back out second change