Import 3-way merge code from bzr
merge3.py is imported as contrib/simplemerge test_merge3.py is imported as tests/test-simplemerge.py
Loading
merge3.py is imported as contrib/simplemerge test_merge3.py is imported as tests/test-simplemerge.py
mentioned in commit 98e3a693061a