diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/remove-base-no-conflicts | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/remove-base-no-conflicts b/t/remove-base-no-conflicts new file mode 100755 index 0000000..9c36985 --- /dev/null +++ b/t/remove-base-no-conflicts @@ -0,0 +1,11 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + no conflicts in this file + +cp -- file file.expected + +normal --remove-base --no-reduce file + +also_interactive '' |