Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 645:a55048b2ae3a
this patch permits hgweb to show the deleted files in the changeset diff
# HG changeset patch
# User kreijack@inwind.REMOVEME.it
# Node ID 08b33970007e753f12b2b2f9d0e169981a6e8c3c
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
this patch permits hgweb to show the deleted files in the changeset diff
author | kreijack@inwind.REMOVEME.it |
---|---|
date | Wed, 06 Jul 2005 22:28:50 -0800 |
parents | eb46971fc57f |
children | c5df1a9c5276 |
line wrap: on
line source
+ hg init + echo nothing + hg add a + hg commit -t ancestor -u test -d '0 0' + echo something + hg commit -t branch1 -u test -d '0 0' + hg co 0 + echo 'something else' + hg commit -t branch2 -u test -d '0 0' + export HGMERGE=merge + HGMERGE=merge + hg up -m 1 merge: warning: conflicts during merge merging a merging a failed! + hg id 32e80765d7fe+75234512624c+ tip + grep -Ev '>>>|<<<' a something else ======= something + hg status C a ? .out