Mercurial Mercurial > hg / 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-interhg.out
author Steve Borho <steve@borho.org>
Fri, 17 Sep 2010 12:44:35 -0500
branchstable
changeset 12317 ed639917c825
parent 10473 634b0e7561ec
permissions -rw-r--r--
test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10473
634b0e7561ec test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset 
     1
 
% log
634b0e7561ec test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset 
     2
 
  <td class="description"><a href="/rev/1b0e7ece6bd6"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</a><span class="branchhead">default</span> <span class="tag">tip</span> </td>
634b0e7561ec test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset 
     3
 
% errors
Mercurial