Git Custom Merge Drivers

June 16, 2016 - git merging

Git merge drivers.

Background:

• defining a custom merger driver

Merge Drivers:

• po merge
• json merge
• logfile
• line ending preprocess
• org mode
• change log
• pom file

Other things:

• merge csv