Make sure rebase on update is always triggered.
treeb9d915e6ae92b904f49142619d7b2730c1850653
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh