Jany-M

####################################################
#	
#	MIMETYPES
#
####################################################

AddType video/mp4  mp4 m4v
AddType audio/mp4  m4a
AddType video/ogg  ogv

karenyyng

Table Of Content

Skip to the relevant sections if needed.

• 2-min tutorial to do it the quick-and-dirty-way
• Concepts for resolving Git conflicts
• Setting up different editors / tool for using git mergetool
  • Finding out what mergetool editors are supported
• mergetool simple code example for vimdiff
  • Resolving conflict from a Git pull
• Other great references and tutorials