Inspect native git behaviour on mergeConflicts on gitlinks

t.sh

git init subm
touch subm/a
git -C subm add a
git -C subm commit -m initSubm

git init root
git -C root submodule add ../subm
git -C root commit -m addingSubm

echo forMaster >>root/subm/a
git -C root/subm commit -a -m modSubmInMasterContext
git -C root commit -a -m updateSubmInMaster

git -C root checkout -b side --recurse-submodules HEAD~
echo forSide >>root/subm/a
git -C root/subm commit -a -m modSubmInSideContext
git -C root commit -a -m updateSubmInSide

git -C root merge master