diff mercurial/version.py @ 6512:368a4ec603cc

merge: introduce mergestate
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Apr 2008 15:02:24 -0500
parents 9cd6292abfdf
children 962eb403165b
line wrap: on
line diff