am: switch --resolved to --continue
[git] / t / t9603 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot