← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mercurial/lucid

« back to all changes in this revision

Viewing changes to tests/test-conflict.out

  • Committer: Bazaar Package Importer
  • Author(s): Vernon Tang
  • Date: 2009-01-18 10:39:58 UTC
  • mfrom: (8.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090118103958-4ep2fqb5nl2pyc7y
Tags: 1.1.2-2
http://bugs.debian.org/512155
* debian/mercurial.postinst: symlink /usr/share/doc/mercurial if dpkg didn't
  do it when upgrading (closes: #512155)
* debian/control: mercurial-common replaces all earlier versions of
  mercurial

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-conflict.out
4
4
warning: conflicts during merge.
5
5
merging a failed!
6
6
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
7
 
There are unresolved merges, you can redo the full merge using:
8
 
  hg update -C 2
9
 
  hg merge 1
 
7
use 'hg resolve' to retry unresolved file merges
10
8
e7fe8eb3e180+0d24b7662d3e+ tip
11
9
<<<<<<< local
12
10
something else