aboutsummaryrefslogtreecommitdiffstats
path: root/t/remove-base-no-conflicts
blob: 9c36985bf78c625ed861749307600c48c7ba6ef5 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
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 ''