aboutsummaryrefslogtreecommitdiffstats
path: root/t/symmetric-no-conflicts
blob: d7c8c7f21fc1ac069f6566e367068c32bb8fe40d (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 --symmetric --no-reduce file

also_interactive ''