Mercurial > hg

comparison hgmerge @ 4362:465b9ea02868

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
4361:99c853a1408c 4362:465b9ea02868