Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3134:4bf2e895cf86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filectx: add rename-aware ancestor algorithm This code works but may trigger recursion depth issues
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Sep 2006 14:58:54 -0500
parents 49988d9f0758
children 41989e55fa37
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes