diff options
Diffstat (limited to 't/no-reduce-2-tail')
| -rwxr-xr-x | t/no-reduce-2-tail | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/no-reduce-2-tail b/t/no-reduce-2-tail new file mode 100755 index 0000000..4eb8bd8 --- /dev/null +++ b/t/no-reduce-2-tail @@ -0,0 +1,21 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + branch-1-first \ + branch-1-second \ + tail-common-first \ + tail-common-second \ + "${TAIL} 2" \ + branch-2-first \ + branch-2-second \ + tail-common-first \ + tail-common-second \ + "${END} 2" + +cp -- file file.expected + +conflict --no-reduce file + +also_interactive s |