Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict.out
author Bryan O'Sullivan <bos@serpentine.com>
Sun, 10 Jul 2005 16:14:06 -0800
changeset 671 efa4a7e2f322
parent 591 eb46971fc57f
child 748 c5df1a9c5276
permissions -rw-r--r--
Move hgrc documentation out to its own man page, hgrc(5). # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 5076cf1fd6a1b8eb410e5e03cb004ca6a52a30f9 # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 Move hgrc documentation out to its own man page, hgrc(5). The new man page expands on the existing documentation by describing the file format and the purpose of each section and field.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg init
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     2
 
+ echo nothing
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     3
 
+ hg add a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg commit -t ancestor -u test -d '0 0'
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     5
 
+ echo something
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     6
 
+ hg commit -t branch1 -u test -d '0 0'
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     7
 
+ hg co 0
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     8
 
+ echo 'something else'
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     9
 
+ hg commit -t branch2 -u test -d '0 0'
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    10
 
+ export HGMERGE=merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    11
 
+ HGMERGE=merge
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 392
diff changeset 
    12
 
+ hg up -m 1
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    13
 
merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    14
 
merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    15
 
merging a failed!
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    16
 
+ hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset 
    17
 
32e80765d7fe+75234512624c+ tip
392
ee4c80d294e5 Tidy up conflict and pull tests
mpm@selenic.com
parents: 377
diff changeset 
    18
 
+ grep -Ev '>>>|<<<' a
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    19
 
something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    20
 
=======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    21
 
something
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    22
 
+ hg status
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    23
 
C a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    24
 
? .out
mercurial-crew-with-dirclash