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