[Xtla-el-dev] ?M in star-merge

[Masatake YAMATO]

During star-merge, xtla fails to handle a line.

...
M   builds/amiga/README
?M  builds/amiga/include/freetype/config/ftconfig.h
...


What does ?M stand for?
Could you fix this?

Masatake