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