github_merge: use combined status (and be more useful)
[nit.git] / contrib / friendz / android /
drwxr-xr-x   ..
drwxr-xr-x - res