Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove the attempt to validate the pdmergeaction option; it wasn't wo…
…rking and doesn't add enough value to be worth digging into further (anything other than `merge` or `resolve` gets treated same as `ignore`). And a tiny bit more debugging.
- Loading branch information