Smudge Filter Breaks when merge conflict #13
Description
because the DXLSmudge filter fails on the merge conflict entry, it does not complete the merge and does not leave the repository in the correct 'merging' state
The only reason the Smudge filter is really there at the moment is that Designer will give a DXL Parse error for the element if it in 'indented' , so the smudge filter was there to 'deflate' it in that case.
Current ideas are to set the smudge filter back to 'cat' only, and maybe run the deflate operation post-checkout using a hook? or re-write the smudge filter to not report a failure. This would involve writing a wrapper script around xsltproc