tests/test-help.t

39161:6618634e3325

  
      step specified via  binary symlink
      ----------------------------------
      1.   --tool         o      o
      2.   HGMERGE        o      o
      3.   merge-patterns o      x
      4.   ui.merge       x      x
  
      Note:
         After selecting a merge program, Mercurial will by default attempt to
         merge the files using a simple merge algorithm first. Only if it
         doesn't succeed because of conflicting changes will Mercurial actually

39162:cded904f7acc

  
      step specified via  binary symlink
      ----------------------------------
      1.   --tool         o      o
      2.   HGMERGE        o      o
      3.   merge-patterns o (*)  x (*)
      4.   ui.merge       x (*)  x (*)
  
      If "merge.strict-capability-check" configuration is true, Mercurial checks
      capabilities of internal merge tools strictly in (*) cases above. It is
      false by default for backward compatibility.
  
      Note:
         After selecting a merge program, Mercurial will by default attempt to
         merge the files using a simple merge algorithm first. Only if it
         doesn't succeed because of conflicting changes will Mercurial actually