Will Palmer [off-list ref] writes:
quoted hunk
merge-tree had no test cases, so here we add some very basic tests for
it, including some known-breakages.
Signed-off-by: Will Palmer <redacted>
---
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
new file mode 100755
index 0000000..c02c986
--- /dev/null
+++ b/t/t4300-merge-tree.sh
...
+test_expect_'file add A, !B' '
Oops?
I'll queue with obvious/trivial fixups. Thanks.