fix issue with merge tickets and disable do merge unless action is chosen
[gitlive] / c /
drwxr-xr-x   ..
-rw-r--r-- 359 xorg_idletime.c