Mercurial > hg
diff mercurial/filemerge.py @ 14998:a5d449fc5e07 stable
merge with i18n
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 01 Aug 2011 10:54:10 -0500 |
parents | e3be7dc9a5e1 |
children | 157d93c41c10 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 01 Aug 2011 10:54:10 -0500 |
parents | e3be7dc9a5e1 |
children | 157d93c41c10 |