]>
asedeno.scripts.mit.edu Git - git.git/blobdiff - t/t7201-co.sh
a
c
e
- |||||||
+ ||||||| master
a
b
c
(
echo "<<<<<<< ours"
echo ourside
- echo "|||||||"
+ echo "||||||| base"
echo original
echo "======="
echo theirside
(
echo "<<<<<<< ours"
echo ourside
- echo "|||||||"
+ echo "||||||| base"
echo original
echo "======="
echo theirside