tests/test-keyword.t

12313:2912881c2a98

  $ hg merge
  merging m
  warning: conflicts during merge.
  merging m failed!
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
  $ cat m
  $Id$
  <<<<<<< local
  bar
  =======

12314:f2daa6ab514a

  $ hg merge
  merging m
  warning: conflicts during merge.
  merging m failed!
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
  $ cat m
  $Id$
  <<<<<<< local
  bar
  =======