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