Mercurial > public > mercurial-scm > hg
diff mercurial/merge.py @ 10489:3232dba5d521 stable
Merge with i18n
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 16 Feb 2010 23:28:46 +0100 |
parents | ba5e508b5e92 |
children | 0e64d814d7d0 |
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 16 Feb 2010 23:28:46 +0100 |
parents | ba5e508b5e92 |
children | 0e64d814d7d0 |