diff hgext/win32text.py @ 11296:0054a328b98f

keyword: use context to detect uncommitted merge
author Christian Ebert <blacktrash@gmx.net>
date Thu, 03 Jun 2010 10:37:31 +0100
parents 5f01fd602542
children c82056f2509f
line wrap: on
line diff