z a.txt
without a
added test.txt
added b.txt
another commit
added c.txt
without b.txt
Merge branch 'witha'
adjusting differences
Merge branch 'witha' - after adjusting the differences
removed c.txt
Merge branch 'witha'