diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/unclosed-conflict-head-parent | 14 | ||||
| -rwxr-xr-x | t/unclosed-conflict-head-parent-tail | 16 |
2 files changed, 30 insertions, 0 deletions
diff --git a/t/unclosed-conflict-head-parent b/t/unclosed-conflict-head-parent new file mode 100755 index 0000000..ae4c501 --- /dev/null +++ b/t/unclosed-conflict-head-parent @@ -0,0 +1,14 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} a" \ + first \ + "${PARENT} b" \ + broken + +cp -- file file.original + +error file + +diff -u -- file file.original >&2 diff --git a/t/unclosed-conflict-head-parent-tail b/t/unclosed-conflict-head-parent-tail new file mode 100755 index 0000000..c05ca5d --- /dev/null +++ b/t/unclosed-conflict-head-parent-tail @@ -0,0 +1,16 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} a" \ + first \ + "${PARENT} b" \ + middle \ + "${TAIL}" \ + broken + +cp -- file file.original + +error file + +diff -u -- file file.original >&2 |