diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/symmetric-3-empty-head | 16 | ||||
| -rwxr-xr-x | t/symmetric-3-empty-head-tail | 15 |
2 files changed, 31 insertions, 0 deletions
diff --git a/t/symmetric-3-empty-head b/t/symmetric-3-empty-head new file mode 100755 index 0000000..af61802 --- /dev/null +++ b/t/symmetric-3-empty-head @@ -0,0 +1,16 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + "${PARENT} 2" \ + 2 \ + "${TAIL}" \ + 2 \ + "${END} theirs" + +cp -- file file.expected + +conflict --symmetric --no-reduce file + +also_interactive y diff --git a/t/symmetric-3-empty-head-tail b/t/symmetric-3-empty-head-tail new file mode 100755 index 0000000..f93cd84 --- /dev/null +++ b/t/symmetric-3-empty-head-tail @@ -0,0 +1,15 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + "${PARENT} 2" \ + base \ + "${TAIL}" \ + "${END} theirs" + +: > file.expected + +normal --symmetric --no-reduce file + +also_interactive y |
