Welcome to mirror list, hosted at ThFree Co, Russian Federation.

not-heredoc.expect « chainlint « t - git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
blob: 2e9bb135fe72a61184f4275aeeb0fcdcde745c89 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
echo "<<<<<<< ours" &&
echo ourside &&
echo "=======" &&
echo theirside &&
echo ">>>>>>> theirs" &&

(
	echo "<<<<<<< ours" &&
	echo ourside &&
	echo "=======" &&
	echo theirside &&
	echo ">>>>>>> theirs" ?!AMP?!
	poodle
) >merged