diff mercurial/merge.py @ 15758:634404392449 stable 2.0.2

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Sun, 01 Jan 2012 13:37:30 -0600
parents d550168f11ce
children 7b7f03502b5a
line wrap: on
line diff