[PATCH 4 of 6 checkunknown] test-merge-force: add tests for merge.checkunknown=warn

[Siddharth Agarwal]

On 2/3/16 13:04, Martin von Zweigbergk wrote:
> Why both "cmp" and "diff"? I'm guessing that if "cmp" finds
> differences, you want to show them with "diff", but then the output
> from "cmp" won't be shown (and not needed), and if there are no
> differences, the output from from "diff" should be empty anyway, no?

That's what an earlier example did -- I assumed because for matching 
files, diff(1) could produce different outputs on different platforms.