]>
Commit | Line | Data |
---|---|---|
22597af9 ES |
1 | # LINT: "<< ours" inside string is not here-doc |
2 | echo "<<<<<<< ours" && | |
3 | echo ourside && | |
4 | echo "=======" && | |
5 | echo theirside && | |
6 | echo ">>>>>>> theirs" && | |
7 | ||
8 | ( | |
9 | # LINT: "<< ours" inside string is not here-doc | |
10 | echo "<<<<<<< ours" && | |
11 | echo ourside && | |
12 | echo "=======" && | |
13 | echo theirside && | |
14 | echo ">>>>>>> theirs" | |
15 | poodle | |
16 | ) >merged |