--- a/mercurial/subrepo.py Sat Jan 09 22:46:26 2016 +0900
+++ b/mercurial/subrepo.py Fri Mar 25 16:23:23 2016 -0500
@@ -1812,9 +1812,9 @@
modified, added, removed = [], [], []
self._gitupdatestat()
if rev2:
- command = ['diff-tree', '-r', rev1, rev2]
+ command = ['diff-tree', '--no-renames', '-r', rev1, rev2]
else:
- command = ['diff-index', rev1]
+ command = ['diff-index', '--no-renames', rev1]
out = self._gitcommand(command)
for line in out.split('\n'):
tab = line.find('\t')
@@ -1873,7 +1873,7 @@
@annotatesubrepoerror
def diff(self, ui, diffopts, node2, match, prefix, **opts):
node1 = self._state[1]
- cmd = ['diff']
+ cmd = ['diff', '--no-renames']
if opts['stat']:
cmd.append('--stat')
else: