1. TortoiseHg
  2. TortoiseHg
  3. thg
  4. Issues
Issue #3469 invalid

Merge commits do not show changes to files changed

imt
created an issue

There are times when executing merges between branches that the tortoise hg commit window will show a file as part of the merge results and that it is about to be commited; however there are times when in the diff window it shows absolutely nothing about the file.

Going to the command line and running hg log -l 1 --patch shows that the file is indeed different.

I'm currently using THG version 2.5.1, with Mercurial-2.3.2, Python-2.7.3, PyQt-4.9.1, Qt-4.8.0, but I've seen this behavior for years across each version I've used.

Comments (2)

  1. Log in to comment