diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/merge-upper-middle-4 | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/t/merge-upper-middle-4 b/t/merge-upper-middle-4 new file mode 100755 index 0000000..c113241 --- /dev/null +++ b/t/merge-upper-middle-4 @@ -0,0 +1,28 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + same \ + "${PARENT} 2" \ + different \ + "${PARENT} 3" \ + same \ + "${TAIL}" \ + same \ + "${END} 4" + +printf '%s\n' > file.expected \ + "${HEAD} 1" \ + same \ + "${PARENT} 2" \ + different \ + "${PARENT} 3" \ + same \ + "${TAIL}" \ + same \ + "${END} 4" + +conflict --merge --no-reduce file + +also_interactive m |