Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 610:4c02464cb9f0
check export options for changeset before running
# HG changeset patch
# User shaleh@speakeasy.net
# Node ID 0cc64f4312540b2081c76dc589cc825d734676d8
# Parent f7bfe827ea381afc89f486b2d93d7f4fe86de04d
check export options for changeset before running
diff -r f7bfe827ea38 -r 0cc64f431254 mercurial/commands.py
author | shaleh@speakeasy.net |
---|---|
date | Mon, 04 Jul 2005 11:06:01 -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