Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

nautilus: fixup bad merge

Changeset 61d011faba8c…

Parent 92a4fe270cd6…

by Steve Borho

Changes to one file · Browse files at 61d011faba8c Showing diff from parent 92a4fe270cd6 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​nautilus-thg.py Stacked
 
135
136
137
138
139
 
 
140
141
142
 
135
136
137
 
 
138
139
140
141
142
@@ -135,8 +135,8 @@
  repo = self.get_repo_for_path(cwd)     if hgcmd == 'vdiff': - diffcmd = repo.ui.config('tortoisehg', 'vdiff', 'vdiff') - if not diffcmd: + diffcmd = repo.ui.config('tortoisehg', 'vdiff', 'vdiff') + if not diffcmd:   hgcmd = 'diff'   else:   cmdline = ['hg', diffcmd]