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.
--- a/mercurial/merge.py Wed Jan 09 00:01:33 2013 +0100
+++ b/mercurial/merge.py Wed Jan 09 00:01:33 2013 +0100
@@ -318,7 +318,7 @@
return action
def actionkey(a):
- return a[1] == 'r' and -1 or 0, a
+ return a[1] == "r" and -1 or 0, a
def applyupdates(repo, action, wctx, mctx, actx, overwrite):
"""apply the merge action list to the working directory
@@ -340,7 +340,7 @@
# prescan for merges
for a in action:
f, m = a[:2]
- if m == 'm': # merge
+ if m == "m": # merge
f2, fd, flags, move = a[2:]
if f == '.hgsubstate': # merged internally
continue