The 'merge' commands must appear after the commit message
treea90da8261d636fb356ab74e8e34630349445aa73
-rw-r--r-- 57 .gitignore
-rw-r--r-- 261 fast-export2.pro
drwxr-xr-x - scripts
drwxr-xr-x - src