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 TK Soh <teekaysoh@yahoo.com>
Tue, 16 Aug 2005 17:30:41 -0800
changeset 924 ab681ea2857e
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
updated help text and added manpage section for hg paths Index: hg/doc/hg.1.txt ===================================================================
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
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     3
 
+ hg commit -m ancestor -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     4
 
+ hg commit -m branch1 -d 0 0
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     5
 
+ hg co 0
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     6
 
+ hg commit -m branch2 -d 0 0
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 392
diff changeset 
     7
 
+ hg up -m 1
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     8
 
merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     9
 
merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    10
 
merging a failed!
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    11
 
+ hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset 
    12
 
32e80765d7fe+75234512624c+ tip
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    13
 
something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    14
 
=======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    15
 
something
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    16
 
+ hg status
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 591
diff changeset 
    17
 
M a
mercurial-crew-with-dirclash