diff mercurial/filemerge.py @ 16037:9232fa4fd1ba stable

glossary: add phase terms
author Matt Mackall <mpm@selenic.com>
date Mon, 30 Jan 2012 14:44:01 -0600
parents e86dd8dfdea0
children 83925d3a4559 b605448eb254
line wrap: on
line diff