Reproduce and fix with gc-pull the merge replay problem.
drwxr-xr-x - client
drwxr-xr-x - scripts
drwxr-xr-x - server
drwxr-xr-x - tests