[Commented On] D8504: diff: add experimental support for "merge diffs"

[durin42 (Augie Fackler)]

durin42 added a comment.


  For anyone curious what's left, the test currently fails like this:
  
    --- tests/test-diff-change.t
    +++ tests/test-diff-change.t.err
    @@ -241,9 +241,15 @@
       ->>>>>>> other: d9e7de69eac3 - test: new file
        9
        10
    +  diff -r 5010caab09f6 new-file-p2.txt
    +  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    +  +++ b/new-file-p2.txt	Thu Jan 01 00:00:00 1970 +0000
    +  @@ -0,0 +1,1 @@
    +  +this file is new in p2 of the merge
     
     There must _NOT_ be a .hg/merge directory leftover.
       $ test ! -e .hg/merge
    -
    -
    -  $ cd ..
    +  [1]
    +
    +
    +  $ cd ..

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8504/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8504

To: durin42, #hg-reviewers
Cc: martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200511/6bb0e44d/attachment-0002.html>