mirror of
https://github.com/git/git
synced 2024-10-31 01:43:41 +00:00
17 lines
319 B
Text
17 lines
319 B
Text
|
# LINT: "<< ours" inside string is not here-doc
|
||
|
echo "<<<<<<< ours" &&
|
||
|
echo ourside &&
|
||
|
echo "=======" &&
|
||
|
echo theirside &&
|
||
|
echo ">>>>>>> theirs" &&
|
||
|
|
||
|
(
|
||
|
# LINT: "<< ours" inside string is not here-doc
|
||
|
echo "<<<<<<< ours" &&
|
||
|
echo ourside &&
|
||
|
echo "=======" &&
|
||
|
echo theirside &&
|
||
|
echo ">>>>>>> theirs"
|
||
|
poodle
|
||
|
) >merged
|