Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset f8af5d2eee93…

Parents 12221e04f04f…

Parents 62b90c025f3f…

by Steve Borho

Changes to one file · Browse files at f8af5d2eee93 Showing diff from parent 12221e04f04f 62b90c025f3f Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
134
135
136
137
138
 
 
139
140
141
 
134
135
136
 
 
137
138
139
140
141
@@ -134,8 +134,8 @@
  None).run()   return None   - lpats = [util.localpath(f) for f in pats] - m = match.match(repo.root, repo.root, lpats) + pats = cmdutil.expandpats(pats) + m = match.match(repo.root, '', pats, None, None, 'relpath')   n2 = ctx2.node()   mod_a, add_a, rem_a = map(set, repo.status(ctx1a.node(), n2, m)[:3])   if ctx1b: