Changed status line to always display relative paths.
Changed regexp of conflict marks to allow text after the '<<<<<<<'.