# Extensions for the files involved in a three-way merge (ancestor,
# current, patched)
#extensions = .ancestor .current .patched
# Extensions for the files involved in a three-way merge (ancestor,
# current, patched)
#extensions = .ancestor .current .patched