@leroysheep / rag-system
Code Commits Pulls CI/CD 81,295
bisect
bisect jch maint master next seen test todo
expect 14 lines 280 Bytes
Raw
1 2 echo "<<<<<<< ours" &&
2 3 echo ourside &&
3 4 echo "=======" &&
4 5 echo theirside &&
5 6 echo ">>>>>>> theirs" &&
6 7
7 8 (
8 9 echo "<<<<<<< ours" &&
9 10 echo ourside &&
10 11 echo "=======" &&
11 12 echo theirside &&
12 13 echo ">>>>>>> theirs" ?!LINT: missing '&&'?!
13 14 poodle
14 15 ) >merged