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