Tree
- Tree:
dc42749dc6849ee2dcd82810a28b425b0cad9eb8
- Date:
- Message:
- fix option processing for 'got merge' Don't make -C imply -c (a break statement was missing). Detect -an and -cn conflicts. Simplify by removing unneeded check for conflicting -aC (since -C requires -c, we can rely on the -ac conflict being detected). Update the man page to say -cC is allowed.