diff mercurial/mdiff.py @ 18329:eb6ca96f4dd0

merge: consistently use "x" instead of 'x' for internal action types This makes it simpler to search for places where the action types are handled.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 09 Jan 2013 00:01:33 +0100
parents 1e13b1184292
children 1e5b38a919dd
line wrap: on
line diff