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