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