repo.or.cz
/
git.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Sync with 2.39.4
[git.git]
/
t
/
chainlint
/
not-heredoc.expect
blob
2e9bb135fe72a61184f4275aeeb0fcdcde745c89
1
echo "<<<<<<< ours" &&
2
echo ourside &&
3
echo "=======" &&
4
echo theirside &&
5
echo ">>>>>>> theirs" &&
6
7
(
8
echo "<<<<<<< ours" &&
9
echo ourside &&
10
echo "=======" &&
11
echo theirside &&
12
echo ">>>>>>> theirs" ?!AMP?!
13
poodle
14
) >merged