comparison hgext/hbisect.py @ 4362:465b9ea02868

Import 3-way merge code from bzr merge3.py is imported as contrib/simplemerge test_merge3.py is imported as tests/test-simplemerge.py
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents 6b4127c7d52a
children 052062b98f26
comparison
equal deleted inserted replaced
4361:99c853a1408c 4362:465b9ea02868