Tree
- Tree:
dc17381718ccab6df1402921ac76be25ffa4513b
- 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.
Makefile.am | commits | blame |
got-read-object.c | commits | blame |