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