changeset 23664:377124ba6b10

trydiff: use 'not in addedset' for symmetry with 'not in removedset' With the previous change in place, we can safely use 'addedset'.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 23 Dec 2014 16:25:00 -0800
parents a9853fc172d2
children a90499a6ad8d
files mercurial/patch.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/patch.py	Tue Dec 23 16:12:54 2014 -0800
+++ b/mercurial/patch.py	Tue Dec 23 16:25:00 2014 -0800
@@ -1807,7 +1807,7 @@
         tn = None
         dodiff = True
         header = []
-        if f in man1:
+        if f not in addedset:
             to = getfilectx(f, ctx1).data()
         if f not in removedset:
             tn = getfilectx(f, ctx2).data()