t / t5100 / msg0015on commit oneway_merge(): only lstat() when told to update worktree (686b2de)
   1  - a list
   2  - of stuff