diff options
Diffstat (limited to 't/select-tail-3-empty-head')
| -rwxr-xr-x | t/select-tail-3-empty-head | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/select-tail-3-empty-head b/t/select-tail-3-empty-head new file mode 100755 index 0000000..424c73b --- /dev/null +++ b/t/select-tail-3-empty-head @@ -0,0 +1,17 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} OURS" \ + "${PARENT} BASE" \ + base \ + "${TAIL}" \ + theirs \ + "${END} THEIRS" + +printf '%s\n' > file.expected \ + theirs + +normal --select-tail --no-reduce file + +also_interactive t |
