peerdrive/client/views/diff3.py
def text_merge(old, other, new, allow_conflicts=1,
               marker1='<<<<<<<<<<<<<<<<<<<<<<<<<\n',
               marker2='=========================\n',
               marker3='>>>>>>>>>>>>>>>>>>>>>>>>>\n'):
    """ do line by line diff3 merge with three strings"""
    result = merge(old.splitlines(1), other.splitlines(1), new.splitlines(1),
                   allow_conflicts, marker1, marker2, marker3)
    return ''.join(result)
 do line by line diff3 merge with three strings
do line by line diff3 merge with three strings
do line by line diff3 merge with three strings
def text_merge(old, other, new, allow_conflicts=1,
               marker1='<<<<<<<<<<<<<<<<<<<<<<<<<\n',
               marker2='=========================\n',
               marker3='>>>>>>>>>>>>>>>>>>>>>>>>>\n'):
    result = merge(old.splitlines(1), other.splitlines(1), new.splitlines(1),
                   allow_conflicts, marker1, marker2, marker3)
    return ''.join(result)
def text_merge ( old , other , new , allow_conflicts = 1 , marker1 = '<<<<<<<<<<<<<<<<<<<<<<<<<\n' , marker2 = '=========================\n' , marker3 = '>>>>>>>>>>>>>>>>>>>>>>>>>\n' ) : result = merge ( old . splitlines ( 1 ) , other . splitlines ( 1 ) , new . splitlines ( 1 ) , allow_conflicts , marker1 , marker2 , marker3 ) return '' . join ( result )
do line by line diff3 merge with three strings
do line by line diff3 merge with three strings
""" do line by line diff3 merge with three strings"""
old
other
new
allow_conflicts
marker1
marker2
marker3