diff python/hg-merge.py @ 368:6f1e4562c06a

typo
author Jeff Hammel <jhammel@mozilla.com>
date Sun, 21 Jul 2013 04:33:33 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff