update git imerge
reformat some quotes
also display bmp files in firefox
diff3 conflictstyle also uses |||||||