# Different three-way merge tools below. Uncomment the preferred one.
# Note that the 'output' file contains the same data as 'branch1'. This
# is useful for tools that do not take an output parameter
# Different three-way merge tools below. Uncomment the preferred one.
# Note that the 'output' file contains the same data as 'branch1'. This
# is useful for tools that do not take an output parameter
merger: diff3 -L local -L older -L remote -m -E \
"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
merger: diff3 -L local -L older -L remote -m -E \
"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"