merge: Make 'merge.log' an integer or boolean option