diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/merge-1 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/merge-1 b/t/merge-1 new file mode 100755 index 0000000..5967f4e --- /dev/null +++ b/t/merge-1 @@ -0,0 +1,11 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} only" \ + only \ + "${END} only" + +cp -- file file.expected + +error --merge --no-reduce file |