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