diff mercurial/filemerge.py @ 15772:83a140752239

progress: Use the same GPL boilerplate as most hg files
author Augie Fackler <durin42@gmail.com>
date Mon, 02 Jan 2012 19:30:28 -0600
parents e86dd8dfdea0
children 83925d3a4559 b605448eb254
line wrap: on
line diff