comparison tests/test-merge-tools.t @ 26967:7a8e9a985c3b

filemerge: remove leading space from " no tool found..."

I could not find or see a reason for the unusual formatting. The lines
following it in the test cases are not indented.

26966:51fa43a3cd58

  false.whatever=
  true.priority=1
  true.executable=cat
  # hg update -C 1
  $ hg merge -r 2 --config ui.merge=internal:prompt
   no tool found to merge f
  keep (l)ocal or take (o)ther? l
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ aftermerge
  # cat f

  false.whatever=
  true.priority=1
  true.executable=cat
  # hg update -C 1
  $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
   no tool found to merge f
  keep (l)ocal or take (o)ther? 
  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
  [1]
  $ aftermerge

  # hg stat
  M f
  # hg resolve --list
  U f
  $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
   no tool found to merge f
  keep (l)ocal or take (o)ther? 
  [1]
  $ aftermerge
  # cat f
  revision 1

  ? f.orig
  # hg resolve --list
  U f
  $ rm f
  $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
   no tool found to merge f
  keep (l)ocal or take (o)ther? 
  [1]
  $ aftermerge
  # cat f
  revision 1

  # hg stat
  M f
  # hg resolve --list
  U f
  $ hg resolve --all --config ui.merge=internal:prompt
   no tool found to merge f
  keep (l)ocal or take (o)ther? l
  (no more unresolved files)
  $ aftermerge
  # cat f
  revision 1

26967:7a8e9a985c3b

  false.whatever=
  true.priority=1
  true.executable=cat
  # hg update -C 1
  $ hg merge -r 2 --config ui.merge=internal:prompt
  no tool found to merge f
  keep (l)ocal or take (o)ther? l
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ aftermerge
  # cat f

  false.whatever=
  true.priority=1
  true.executable=cat
  # hg update -C 1
  $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
  no tool found to merge f
  keep (l)ocal or take (o)ther? 
  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
  [1]
  $ aftermerge

  # hg stat
  M f
  # hg resolve --list
  U f
  $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
  no tool found to merge f
  keep (l)ocal or take (o)ther? 
  [1]
  $ aftermerge
  # cat f
  revision 1

  ? f.orig
  # hg resolve --list
  U f
  $ rm f
  $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
  no tool found to merge f
  keep (l)ocal or take (o)ther? 
  [1]
  $ aftermerge
  # cat f
  revision 1

  # hg stat
  M f
  # hg resolve --list
  U f
  $ hg resolve --all --config ui.merge=internal:prompt
  no tool found to merge f
  keep (l)ocal or take (o)ther? l
  (no more unresolved files)
  $ aftermerge
  # cat f
  revision 1