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 Hollis Blanchard <hollisb@us.ibm.com>
Wed, 15 Mar 2006 03:19:16 +0100
changeset 1950 5f581f337b05
parent 1933 7544700fd931
child 2175 b2ae81a7df29
permissions -rw-r--r--
hgk "committer:" bug I've been having an hgk problem with this tree: http://xenbits.xensource.com/ext/linux-ppc-2.6.hg, specifically changeset 93c590d23a53. The problem seems to be that the commit message contains a "committer:" line, which triggers a (relatively unused?) case in hgk.py... Both cases need the dates at the end of the line.
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
mercurial-crew-with-dirclash