comparison mercurial/simplemerge.py @ 11975:21884b433c51

tests: unify test-merge1
author Pradeepkumar Gayam <in3xes@gmail.com>
date Wed, 18 Aug 2010 05:05:51 +0530
parents 08a0f04b56bd
children 81c4e18c7cee
comparison
equal deleted inserted replaced
11974:ccd581c66284 11975:21884b433c51