Skip to content
Snippets Groups Projects
Commit 465b9ea0 authored by Alexis S. L. Carvalho's avatar Alexis S. L. Carvalho
Browse files

Import 3-way merge code from bzr

merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
parent 99c853a1
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment