- git: add fco alias + windows conf
- ./merge add merge compat for windows