diff options
Diffstat (limited to 't/combination-2-merge')
| -rwxr-xr-x | t/combination-2-merge | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/t/combination-2-merge b/t/combination-2-merge new file mode 100755 index 0000000..5379244 --- /dev/null +++ b/t/combination-2-merge @@ -0,0 +1,20 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + same \ + ours \ + "${PARENT} base" \ + same \ + base \ + "${TAIL}" \ + same \ + ours \ + "${END} theirs" + +cp -- file file.expected + +conflict --merge --merge --no-reduce file + +also_interactive m |