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