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