Show More
@@ -307,7 +307,8 b' class hgsubrepo(abstractsubrepo):' | |||||
307 | node1 = node.bin(self._state[1]) |
|
307 | node1 = node.bin(self._state[1]) | |
308 | # We currently expect node2 to come from substate and be |
|
308 | # We currently expect node2 to come from substate and be | |
309 | # in hex format |
|
309 | # in hex format | |
310 |
node2 |
|
310 | if node2 is not None: | |
|
311 | node2 = node.bin(node2) | |||
311 | cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, |
|
312 | cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, | |
312 | node1, node2, match, |
|
313 | node1, node2, match, | |
313 | prefix=os.path.join(prefix, self._path), |
|
314 | prefix=os.path.join(prefix, self._path), |
General Comments 0
You need to be logged in to leave comments.
Login now