diff options
Diffstat (limited to 't/merge-multiple-files')
| -rwxr-xr-x | t/merge-multiple-files | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/merge-multiple-files b/t/merge-multiple-files new file mode 100755 index 0000000..23a8bb5 --- /dev/null +++ b/t/merge-multiple-files @@ -0,0 +1,30 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > first \ + "${HEAD} ours" \ + same \ + "${PARENT} base" \ + same \ + "${TAIL}" \ + first-different \ + "${END} theirs" + +printf '%s\n' > first.expected \ + first-different + +printf '%s\n' > second \ + "${HEAD} ours" \ + second-different \ + "${PARENT} base" \ + same \ + "${TAIL}" \ + same \ + "${END} theirs" + +printf '%s\n' > second.expected \ + second-different + +normal --merge --no-reduce first second + +also_interactive mm |