Fix diff-options to only be considered for the diff view

This allows to put the following in ~/.tigrc to have richer merge diffs:

	set diff-options = -m --first-parent

and still have meaningful revision graphs.

Fixes #228