[PATCH] Add read-tree -m 3-way merge tests.