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