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