Sign in
googlers
/
jrn
/
git
/
next
/
.
/
t
/
chainlint
/
not-heredoc.expect
blob: 2e9bb135fe72a61184f4275aeeb0fcdcde745c89 [
file
] [
log
] [
blame
]
echo
"<<<<<<< ours"
&&
echo ourside
&&
echo
"======="
&&
echo theirside
&&
echo
">>>>>>> theirs"
&&
(
echo
"<<<<<<< ours"
&&
echo ourside
&&
echo
"======="
&&
echo theirside
&&
echo
">>>>>>> theirs"
?!
AMP
?!
poodle
)
>
merged
