fix issue with merge tickets and disable do merge unless action is chosen
[gitlive] / tests /
drwxr-xr-x   ..
-rw-r--r-- 850 soup.js
-rw-r--r-- 1907 tickets.js
-rwxr-xr-x 7472 xidletime
-rw-r--r-- 417 xidletime.c