t / t5100 / msg0016on commit t5520-pull: Add testcases showing spurious conflicts from git pull --rebase (3cee923)
   1and some content
   2