Remove commit id from conflicting files, do not use pager while printing diff