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