Start the 2.46 cycle
[git.git] / t / chainlint / not-heredoc.expect
blob2e9bb135fe72a61184f4275aeeb0fcdcde745c89
1 echo "<<<<<<< ours" &&
2 echo ourside &&
3 echo "=======" &&
4 echo theirside &&
5 echo ">>>>>>> theirs" &&
8         echo "<<<<<<< ours" &&
9         echo ourside &&
10         echo "=======" &&
11         echo theirside &&
12         echo ">>>>>>> theirs" ?!AMP?!
13         poodle
14 ) >merged