Mercurial Mercurial > hg-stable / 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 Chris Mason <mason@suse.com>
Thu, 20 Apr 2006 13:08:16 -0400
changeset 2101 c6c019fd5db1
parent 1933 7544700fd931
child 2175 b2ae81a7df29
permissions -rw-r--r--
Make bundlerepo use proper index format for revlogng bundlerepo just appends index entries from the bundle onto the index for the current repo. This patch makes sure it appends the correct format.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     1
 
merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     2
 
merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     3
 
merging a failed!
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset 
     4
 
e7fe8eb3e180+0d24b7662d3e+ tip
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     5
 
something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     6
 
=======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     7
 
something
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 591
diff changeset 
     8
 
M a
hg-stable