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