Use git-diff to list added and modified files. Quote file lists.

Without quotes, grep and other utils would fail on files with spaces in their
name.
Improve the regex for the merge_conflict check.

Match all of <<<<<<< >>>>>>> =======
Merge branch 'misc_fixes'