diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/combination-merge-symmetric | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/combination-merge-symmetric b/t/combination-merge-symmetric new file mode 100755 index 0000000..40e2adc --- /dev/null +++ b/t/combination-merge-symmetric @@ -0,0 +1,26 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + old-1 \ + "${PARENT} 1" \ + old-1 \ + "${TAIL} 1" \ + new-1 \ + "${END} 1" \ + "${HEAD} 2" \ + new-2 \ + "${PARENT} 2" \ + old-2 \ + "${TAIL} 2" \ + new-2 \ + "${END} 2" + +printf '%s\n' > file.expected \ + new-1 \ + new-2 + +normal --merge --symmetric --no-reduce file + +also_interactive my |