Open Wilfred opened 5 years ago
Parents: ... snipped ... Merged Files: unresolved foo.txt Unmodified files during merge: modified bar.txt
There should be a blank line before Unmodified.
There should be a blank line before Unmodified.