Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1609:c50bddfbc812

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate backtrace when piping output on windows. this fixes issue 54.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 02 Jan 2006 15:25:33 -0800
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a