Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1504:0fcdd126642d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix file opening for some commands on Windows Using file as opener in debug commands won't work on Windows, as the index and data files needs to be opened in binary mode.
author Christian Boos <cboos@neuf.fr>
date Thu, 03 Nov 2005 14:24:07 -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