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