Mercurial > hg
view tests/test-rebuildstate.out @ 7385:8119c1a607c4
mergetools: add pointer to the usual filemerge path
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sun, 16 Nov 2008 20:56:55 -0800 |
parents | ffeb926d57ce |
children |
line wrap: on
line source
adding bar adding foo % state dump after n 666 -1 bar n 666 -1 foo % status ! bar ? baz C foo