I forgot to do a git-update-cache on the merged files ...
Attach a file by drag & drop or click to upload
