如果我进入 tig 主视图，我会得到一个很好的提交和合并图表。我更愿意只查看对主干的合并提交，但与普通提交 tig 不同，其中 tig 显示带有文件内容的完整差异，在合并提交时，它仅在差异视图中显示已更改文件的列表。如何让 tig 在合并提交时显示文件内容差异？
提交 fb56223ec50cf659a308b3c9979c912881147689
Refs: [master], {origin/master}, {origin/HEAD}, juju-1.21-alpha1-229-gfb56223
Merge: 7e7c95d a017b5a
作者: Juju bot
AuthorDate: Mon Sep 22 01:201:30
提交：Juju bot 提交日期
：2014 年 9 月 22 日星期一 01:22:03 +0100
Merge pull request #803 from mjs/check-ssh-api-methods-are-allowed-during-upgrade
cmd/juju: ensure that API calls used by "juju ssh" are allowed during upgrades
We recently had a regression where an API call required by "juju ssh" wasn't being allowed by the API server while upgrades are in progress. "juju ssh" is one of the few commands that is supposed to work during upgrades.
The Client used by "juju ssh" is now forced into an interface and this is checked using reflection against what the API server will allow during upgrades. Effectively, the compiler helps to check that the required API methods will be allowed.
http://reviews.vapour.ws/r/64/diff/
apiserver/upgrading_root.go | 20 +++++++++++---------
cmd/juju/ssh.go | 15 +++++++++++----
cmd/juju/ssh_test.go | 24 ++++++++++++++++++++++++
3 个文件更改，46 个插入 (+)，13 个删除 (-)
导航到视图中的单个文件 (j/k)，表示按“Enter”查看文件差异，但按 Enter 键会收到“无法找到文件差异”错误消息。理想情况下，我只是查看合并提交的组合差异。
[更新]我用 sysdig 跟踪了 tig，看起来它在执行以下操作，合并提交时不会显示实际的差异。git show --encoding=UTF-8 --pretty=fuller --root --patch-with-stat --show-notes --no-color fb56223ec50cf659a308b3c9979c912881147689 --
我想我在合并提交上寻找的是解析父提交然后执行以下操作 git diff 7e7c95d a017b5a
[更新]所以差异实际上在这里是不正确的，因为差异将在两个父母之间，并且比合并本身更包含变化，差异的最佳内容渲染似乎是
git diff fb56223^ fb56223