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