Upgrade the client post-checkout hook to automatically reset the merge attribute...
drwxr-xr-x - client
drwxr-xr-x - scripts
drwxr-xr-x - server
drwxr-xr-x - tests