# 使用差异查看器比较文件和文件夹版本

> For the complete documentation index, see [llms.txt](https://www.jetbrains.com/zh-cn/help/clion/llms.txt).

CLion 允许您检查文件/文件夹的两个修订版本之间的差异，或者它们当前的本地副本与版本库版本之间的差异。 差异显示在   差异查看器  中。

Procedure: 将已修改的文件与其 Git 仓库版本进行比较

1. 打开   提交   工具窗口（ `Alt+0` (Windows), `⌘ 0` (macOS), `⌘ 0` (IntelliJ IDEA Classic (macOS)), `⌘ 0` (macOS System Shortcuts), `Alt+0` (XWin), `Alt+0` (GNOME), `Alt+0` (KDE), `Alt+0` (Emacs), `Alt+0` (Sublime Text), `⌘ 0` (Sublime Text (macOS)), `⌘ 0` (Xcode), `Alt+0` (Visual Studio), `Alt+0` (Visual Studio (macOS)), `Alt+0` (ReSharper), `Alt+0` (ReSharper (macOS)), `Alt+0` (QtCreator), `⌘ 0` (QtCreator (macOS)), `Alt+0` (NetBeans), `Alt+0` (Eclipse), `⌘ 0` (Eclipse (macOS))）。

2. 在变更列表中找到所需文件，然后执行以下操作之一：

* 右键点击该文件并选择 `Git | 显示差异` 。

* 选择文件并按下 `Ctrl+D` (Windows), `⌘ D` (macOS), `⌘ D` (IntelliJ IDEA Classic (macOS)), `⌘ D` (macOS System Shortcuts), `Ctrl+D` (XWin), `Ctrl+D` (GNOME), `Ctrl+D` (KDE), `Ctrl+D` (Emacs), `Ctrl+D` (Sublime Text), `⌘ D` (Sublime Text (macOS)), `⌘ D` (Xcode), `Ctrl+D` (Visual Studio), `⌘ D` (Visual Studio (macOS)), `Ctrl+D` (ReSharper), `⌘ D` (ReSharper (macOS)), `Ctrl+D` (QtCreator), `⌘ D` (QtCreator (macOS)), `Ctrl+D` (NetBeans), `Ctrl+D` (Eclipse), `⌘ D` (Eclipse (macOS))。

* 双击文件。

3. 文件的差异视图将打开，其中文件的更改会被高亮显示。

右窗格包含文件的修改版本。 您可以在差异视图中编辑它。

左侧窗格包含文件的初始版本。 它是只读的。 您可以点击 ![还原](https://resources.jetbrains.com/help/img/idea/2026.3/app-client.expui.diff.applyNotConflictsLeft.svg) (   还原  ) 撤销更改。

如果您将鼠标悬停在左侧窗格顶部的提交哈希上，会显示一个工具提示，其中包含提交详情，例如提交消息、作者、日期和时间，以及完整的提交哈希。 您可以点击完整的提交哈希，在   日志  选项卡中的   Git  工具窗口 `Alt+9` (Windows), `⌘ 9` (macOS), `⌘ 9` (IntelliJ IDEA Classic (macOS)), `⌘ 9` (macOS System Shortcuts), `Alt+9` (XWin), `Alt+9` (GNOME), `Alt+9` (KDE), `Alt+9` (Emacs), `Alt+9` (Sublime Text), `⌘ 9` (Sublime Text (macOS)), `⌘ 2` (Xcode), `Alt+9` (Visual Studio), `⌘ 9` (Visual Studio (macOS)), `Alt+9` (ReSharper), `⌘ 9` (ReSharper (macOS)), `Alt+9` (QtCreator), `⌘ 9` (QtCreator (macOS)), `Alt+9` (NetBeans), `Alt+9` (Eclipse), `⌘ 9` (Eclipse (macOS))中打开相应的提交。

Procedure: 将当前修订版的文件或文件夹与同一 Git 分支中的修订版进行比较

1. 在   项目  工具窗口( `Alt+1` (Windows), `⌘ 1` (macOS), `⌘ 1` (IntelliJ IDEA Classic (macOS)), `⌘ 1` (macOS System Shortcuts), `Alt+1` (XWin), `Alt+1` (GNOME), `Alt+1` (KDE), `Alt+1` (Emacs), `Alt+1` (Sublime Text), `⌘ 1` (Sublime Text (macOS)), `⌘ 1` (Xcode), `Ctrl+Alt+L` (Visual Studio), `⌘ ⌥ L` (Visual Studio (macOS)), `Alt+1` (ReSharper), `⌘ 1` (ReSharper (macOS)), `Alt+X` (QtCreator), `⌃ X` (QtCreator (macOS)), `Ctrl+1` (NetBeans), `Alt+1` (Eclipse), `Alt+1` (Eclipse (macOS)))中选择一个文件或文件夹，然后从上下文菜单中选择  `Git | 与修订版本比较` 。

2. 从打开的对话框中选择一个要与当前文件或文件夹版本进行比较的修订版本。

Procedure: 将文件或文件夹的当前修订版本与另一个 Git 分支或标签进行比较

1. 在   项目  工具窗口( `Alt+1` (Windows), `⌘ 1` (macOS), `⌘ 1` (IntelliJ IDEA Classic (macOS)), `⌘ 1` (macOS System Shortcuts), `Alt+1` (XWin), `Alt+1` (GNOME), `Alt+1` (KDE), `Alt+1` (Emacs), `Alt+1` (Sublime Text), `⌘ 1` (Sublime Text (macOS)), `⌘ 1` (Xcode), `Ctrl+Alt+L` (Visual Studio), `⌘ ⌥ L` (Visual Studio (macOS)), `Alt+1` (ReSharper), `⌘ 1` (ReSharper (macOS)), `Alt+X` (QtCreator), `⌃ X` (QtCreator (macOS)), `Ctrl+1` (NetBeans), `Alt+1` (Eclipse), `Alt+1` (Eclipse (macOS)))中选择一个文件或文件夹，然后从上下文菜单中选择  `Git | 与分支或标签比较` 。

2. 在打开的对话框中选择要与当前文件或文件夹版本进行比较的分支或标签。

## 将本地更改与基准修订版本进行比较

除了在编辑器中 [导航](adding-files-to-version-control.html#track_changes)查看文件中的本地更改，您还可以查看这些更改与文件基准版本的对比。

要预览差异，请在   提交   工具窗口中选择一个已修改的文件，然后双击它或按 `Ctrl+D` (Windows), `⌘ D` (macOS), `⌘ D` (IntelliJ IDEA Classic (macOS)), `⌘ D` (macOS System Shortcuts), `Ctrl+D` (XWin), `Ctrl+D` (GNOME), `Ctrl+D` (KDE), `Ctrl+D` (Emacs), `Ctrl+D` (Sublime Text), `⌘ D` (Sublime Text (macOS)), `⌘ D` (Xcode), `Ctrl+D` (Visual Studio), `⌘ D` (Visual Studio (macOS)), `Ctrl+D` (ReSharper), `⌘ D` (ReSharper (macOS)), `Ctrl+D` (QtCreator), `⌘ D` (QtCreator (macOS)), `Ctrl+D` (NetBeans), `Ctrl+D` (Eclipse), `⌘ D` (Eclipse (macOS))。

左窗格显示基础修订版中的受影响代码，右窗格显示您在本地更改后的受影响代码。

![编辑器中的差异预览](https://resources.jetbrains.com/help/img/idea/2026.3/cl_diff_in_editor.png)

请使用工具栏按钮和控件在更改之间导航，并配置   更改详情   窗格或   差异查看器   的外观：

|  项  |  工具提示和快捷键  |  描述  |
| --- | --- | --- |
|  ![上一差异按钮](https://resources.jetbrains.com/help/img/idea/2026.3/app-client.expui.general.up.svg)/ ![下一个差异按钮](https://resources.jetbrains.com/help/img/idea/2026.3/app-client.expui.general.down.svg)  |  上一个差异/下一个差异 `Shift+F7` (Windows), `⇧ F7` (macOS), `⇧ F7` (IntelliJ IDEA Classic (macOS)), `⌘ [` (macOS System Shortcuts), `Shift+F7` (XWin), `Shift+F7` (GNOME), `Shift+F7` (KDE), `Shift+F7` (Emacs), `Shift+F7` (Sublime Text), `⇧ F7` (Sublime Text (macOS)), `⇧ F7` (Xcode), `Shift+F7` (Visual Studio), `⇧ F7` (Visual Studio (macOS)), `Shift+F7` (ReSharper), `⇧ F7` (ReSharper (macOS)), `Shift+F7` (QtCreator), `⇧ F7` (QtCreator (macOS)), `Shift+F7` (NetBeans), `Shift+F7` (Eclipse), `⇧ F7` (Eclipse (macOS)) `F7` (Windows), `F7` (macOS), `F7` (IntelliJ IDEA Classic (macOS)), `⌘ ]` (macOS System Shortcuts), `F7` (XWin), `F7` (GNOME), `F7` (KDE), `F7` (Emacs), `F7` (Sublime Text), `F7` (Sublime Text (macOS)), `F7` (Xcode), `F7` (Visual Studio), `F7` (Visual Studio (macOS)), `F7` (ReSharper), `F7` (ReSharper (macOS)), `F7` (QtCreator), `F7` (QtCreator (macOS)), `F7` (NetBeans), `Ctrl+F7` (Eclipse), `⌃ F7` (Eclipse (macOS))  |     跳转到下一个或上一个差异。       当到达最后一个或第一个差异时，CLion 建议点击箭头按钮或再次按 `F7` (Windows), `F7` (macOS), `F7` (IntelliJ IDEA Classic (macOS)), `⌘ ]` (macOS System Shortcuts), `F7` (XWin), `F7` (GNOME), `F7` (KDE), `F7` (Emacs), `F7` (Sublime Text), `F7` (Sublime Text (macOS)), `F7` (Xcode), `F7` (Visual Studio), `F7` (Visual Studio (macOS)), `F7` (ReSharper), `F7` (ReSharper (macOS)), `F7` (QtCreator), `F7` (QtCreator (macOS)), `F7` (NetBeans), `Ctrl+F7` (Eclipse), `⌃ F7` (Eclipse (macOS))/ `Shift+F7` (Windows), `⇧ F7` (macOS), `⇧ F7` (IntelliJ IDEA Classic (macOS)), `⌘ [` (macOS System Shortcuts), `Shift+F7` (XWin), `Shift+F7` (GNOME), `Shift+F7` (KDE), `Shift+F7` (Emacs), `Shift+F7` (Sublime Text), `⇧ F7` (Sublime Text (macOS)), `⇧ F7` (Xcode), `Shift+F7` (Visual Studio), `⇧ F7` (Visual Studio (macOS)), `Shift+F7` (ReSharper), `⇧ F7` (ReSharper (macOS)), `Shift+F7` (QtCreator), `⇧ F7` (QtCreator (macOS)), `Shift+F7` (NetBeans), `Shift+F7` (Eclipse), `⇧ F7` (Eclipse (macOS)) 并比较其他本地修改的文件。 该行为依赖于 [Go to the next file after reaching last change](settings-tools-diff-and-merge.html#last_diff)选项中的 [差异查看器 settings](settings-tools-diff-and-merge.html)。     |
|  ![“跳转到源代码”按钮](https://resources.jetbrains.com/help/img/idea/2026.3/app-client.expui.general.edit.svg)  |     跳转到源    `F4` (Windows), `⌘ ↓` (macOS), `F4` (IntelliJ IDEA Classic (macOS)), `F4` (macOS System Shortcuts), `F4` (XWin), `F4` (GNOME), `F4` (KDE), `F4` (Emacs), `F4` (Sublime Text), `F4` (Sublime Text (macOS)), `⌘ ↓` (Xcode), `F4` (Visual Studio), `⌘ ↓` (Visual Studio (macOS)), `F4` (ReSharper), `⌘ ↓` (ReSharper (macOS)), `F4` (QtCreator), `F4` (QtCreator (macOS)), `F4` (NetBeans), `F12` (Eclipse), `F3` (Eclipse (macOS))  |  在编辑器中打开选定的文件。 文本光标的位置与   差异查看器   相同。  |
|     ![“比较前一个文件”图标](https://resources.jetbrains.com/help/img/idea/2026.3/app-client.expui.general.left.svg)       ![“下一个文件比较”图标](https://resources.jetbrains.com/help/img/idea/2026.3/app-client.expui.general.right.svg)     |     比较前一个/下一个文件    `Alt+Left` (Windows), `⌘ ⇧ [` (macOS), `⌃ ←` (IntelliJ IDEA Classic (macOS)), `⌘ ⌥ ←` (macOS System Shortcuts), `Alt+Left` (XWin), `Alt+Left` (GNOME), `Alt+Left` (KDE), `Alt+Left` (Emacs), `Ctrl+Page Up` (Sublime Text), `⌘ ⇧ [` (Sublime Text (macOS)), `⌘ ⇧ [` (Xcode), `Alt+Left` (Visual Studio), `⌘ ⇧ [` (Visual Studio (macOS)), `Alt+Left` (ReSharper), `⌘ ⇧ [` (ReSharper (macOS)), `Alt+Left` (QtCreator), `Alt+Left` (QtCreator (macOS)), `Ctrl+Page Up` (NetBeans), `Ctrl+Shift+F6` (Eclipse), `⌘ ⇧ F6` (Eclipse (macOS)) `Alt+Right` (Windows), `⌘ ⇧ ]` (macOS), `⌃ →` (IntelliJ IDEA Classic (macOS)), `⌘ ⌥ →` (macOS System Shortcuts), `Alt+Right` (XWin), `Alt+Right` (GNOME), `Alt+Right` (KDE), `Alt+Right` (Emacs), `Ctrl+Page Down` (Sublime Text), `⌘ ⇧ ]` (Sublime Text (macOS)), `⌘ ⇧ ]` (Xcode), `Alt+Right` (Visual Studio), `⌘ ⇧ ]` (Visual Studio (macOS)), `Alt+Right` (ReSharper), `⌘ ⇧ ]` (ReSharper (macOS)), `Alt+Right` (QtCreator), `Alt+Right` (QtCreator (macOS)), `Ctrl+Page Down` (NetBeans), `Ctrl+F6` (Eclipse), `⌘ F6` (Eclipse (macOS))  |     将本地副本的前一个或下一个文件与其从服务器更新的文件进行比较。      > **Note:** > 这些控件仅在本地修改了多个文件时才可用。    |
|     并排查看器 / 统一查看器     |     选择查看模式：并排或统一。 并排模式有两个面板，而统一模式只有一个面板。       您可以在两个查看器中编辑代码并执行   接受  、   追加  、   还原   操作。       您只能在并排查看器的右侧部分或统一查看器的下行更改文本。       您只能编辑文件的本地版本。 您不能编辑只读状态的文件。     |
|  ![折叠未更改片段图标](https://resources.jetbrains.com/help/img/idea/2026.3/app-client.expui.general.collapseAll.svg)  |  收起未更改的片段  |  收起两个文件中所有未更改的片段。 不可折叠的未更改行的数量可以在   差异与合并  设置页面中配置。 要打开   差异与合并  页面，请按 `Ctrl+Alt+S` (Windows), `⌘ Comma` (macOS), `⌘ Comma` (IntelliJ IDEA Classic (macOS)), `⌘ Comma` (macOS System Shortcuts), `Ctrl+Alt+S` (XWin), `Ctrl+Alt+S` (GNOME), `Ctrl+Alt+S` (KDE), `Ctrl+Alt+S` (Emacs), `Ctrl+Alt+S` (Sublime Text), `⌘ Comma` (Sublime Text (macOS)), `⌘ Comma` (Xcode), `Ctrl+Alt+S` (Visual Studio), `⌘ Comma` (Visual Studio (macOS)), `Ctrl+Alt+S` (ReSharper), `⌘ Comma` (ReSharper (macOS)), `Ctrl+Alt+S` (QtCreator), `⌘ Comma` (QtCreator (macOS)), `Ctrl+Alt+S` (NetBeans), `Ctrl+Alt+S` (Eclipse), `⌘ Comma` (Eclipse (macOS))进入设置，然后导航至  `工具 \| Diff & Merge` 。 .  |
|  ![设置按钮](https://resources.jetbrains.com/help/img/idea/2026.3/app-client.expui.general.settings.svg)  |  设置  |     这些命令也可以从差异查看器装订区域的上下文菜单中找到。         在并排差异中对齐更改  ：通过用空白填充差异，垂直对齐相应的行。       同步滚动：同时滚动两个差异窗格。         在编辑器标签页中显示差异  ：将差异查看器显示为编辑器标签页，而不是单独的窗口。         在单独窗口中显示差异  ：将差异查看器显示为单独的窗口，而不是编辑器标签页。         忽略差异  ：定义差异查看器如何处理空格。        * 无 ：空格很重要，所有差异都会被突出显示。 此选项默认情况下会被选中。    * 去除空格 ：如果行首或行尾出现空白字符，则删除这些空白字符（ `("\t", " ")` ）。 * 如果两行仅在尾随空格上有所不同，这些行将被视为相等。 * 如果两行不同，则在 [By word](#highlight)模式下，尾随空格不会被高亮显示。    * 忽略空白字符 ：空白字符并不重要，不论在源代码中的位置。    * 忽略空格和空行 ：忽略空格和空行。 以下实体被忽略： * 所有空白（如“忽略空白”选项中） * 所有仅由空格组成的添加或删除的行 * 所有仅涉及拆分或合并行且不更改非空白部分的更改。 例如，在此模式下不会突出显示 `a b c` 和 `a \n b c` 之间的差异。        高亮显示差异  ：选择差异粒度的高亮显示方式。        * 词语 ：修改的词汇已高亮显示    * 行 ：已修改的行已高亮显示    * 拆分更改 ：如果选择此选项，大的更改将被分解为较小的更改。 例如， `A \n B` 和 `A X \n B X` 会被视为两个更改，而不是一个。    * 字符 ：修改后的符号已高亮显示    * 无 ：如果选择此选项，将不突出显示差异。 当您处理显著修改过的文件时，请使用 无 选项。 在这种情况下，高亮显示可能会在审核期间引入额外的困难。    |
|  ![外部工具图标](https://resources.jetbrains.com/help/img/idea/2026.3/app.general.externalTools.svg)  |  在外部工具中显示差异  |     在 [External Diff Tools](settings-tools-external-diff-tools.html) 设置页面中指定的外部差异查看器。       仅当   使用外部 diff 工具  选项在 [External Diff Tools](settings-tools-external-diff-tools.html)设置页面上启用时，此按钮才会在工具栏上显示。     |
|  ![帮助图标](https://resources.jetbrains.com/help/img/idea/2026.3/app.actions.help.svg)  |     帮助    `F1` (Windows), `⌘ ⇧ F1` (macOS), `F1` (IntelliJ IDEA Classic (macOS)), `⌘ ⇧ F1` (macOS System Shortcuts), `F1` (XWin), `F1` (GNOME), `F1` (KDE), `F1` (Emacs), `F1` (Sublime Text), `⌘ ⇧ F1` (Sublime Text (macOS)), `⌘ ⇧ F1` (Xcode), `F1` (Visual Studio), `F1` (Visual Studio (macOS)), `F1` (ReSharper), `F1` (ReSharper (macOS)), `F1` (QtCreator), `F1` (QtCreator (macOS)), `F1` (NetBeans), `F1` (Eclipse), `⌘ ⇧ F1` (Eclipse (macOS))  |  打开浏览器并显示相应的帮助页面。  |
|  |  使用 GitBlame 注释  |     此选项仅可从装订区域的上下文菜单中使用。       使用此选项可以查看谁在何时对存储库版本的文件进行了哪些更改。   注解   视图使您可以查看每行代码的详细信息，例如此行的版本、提交此行的用户 ID 以及提交日期。       有关注解的更多信息，请参阅 [定位代码作者（使用 Git Blame 注释）](investigate-changes.html#annotate_blame)。     |

最有用的快捷键如下：

|  快捷方式  |  描述  |
| --- | --- |
|  `Ctrl+Shift+D` (Windows), `⌘ ⇧ D` (macOS), `⌘ ⇧ D` (IntelliJ IDEA Classic (macOS)), `⌘ ⇧ D` (macOS System Shortcuts), `Ctrl+Shift+D` (XWin), `Ctrl+Shift+D` (GNOME), `Ctrl+Shift+D` (KDE), `Ctrl+Shift+D` (Emacs), `Ctrl+Shift+D` (Sublime Text), `Ctrl+Shift+D` (Sublime Text (macOS)), `⌘ ⇧ D` (Xcode), `Ctrl+Shift+D` (Visual Studio), `⌘ ⇧ D` (Visual Studio (macOS)), `Ctrl+Shift+D` (ReSharper), `⌘ ⇧ D` (ReSharper (macOS)), `Ctrl+Shift+D` (QtCreator), `⌘ ⇧ D` (QtCreator (macOS)), `Ctrl+Shift+D` (NetBeans), `Ctrl+Shift+D` (Eclipse), `⌘ ⇧ D` (Eclipse (macOS))  |  使用此键盘快捷键显示最常用的差异命令的弹出菜单。  |
|  `Ctrl+Shift+Tab` (Windows), `⌃ ⇧ ⇥` (macOS), `⌃ ⇧ ⇥` (IntelliJ IDEA Classic (macOS)), `⌃ ⇧ ⇥` (macOS System Shortcuts), `Ctrl+Shift+Tab` (XWin), `Ctrl+Shift+Tab` (GNOME), `Ctrl+Shift+Tab` (KDE), `Ctrl+Shift+Tab` (Emacs), `Ctrl+Shift+Tab` (Sublime Text), `⌃ ⇧ ⇥` (Sublime Text (macOS)), `⌃ ⇧ ⇥` (Xcode), `Ctrl+Shift+Tab` (Visual Studio), `⌃ ⇧ ⇥` (Visual Studio (macOS)), `Ctrl+Shift+Tab` (ReSharper), `⌃ ⇧ ⇥` (ReSharper (macOS)), `Ctrl+Shift+Tab` (QtCreator), `⌃ ⇧ ⇥` (QtCreator (macOS)), `Ctrl+Shift+Tab` (NetBeans), `Ctrl+Shift+Tab` (Eclipse), `⌃ ⇧ ⇥` (Eclipse (macOS))  |  使用此键盘快捷键在左窗格和右窗格之间切换。  |
|  `Ctrl+Z` (Windows), `⌘ Z` (macOS), `⌘ Z` (IntelliJ IDEA Classic (macOS)), `⌘ Z` (macOS System Shortcuts), `Ctrl+Z` (XWin), `Ctrl+Z` (GNOME), `Ctrl+Z` (KDE), `Ctrl+Shift+Minus` (Emacs), `Ctrl+Z` (Sublime Text), `⌘ Z` (Sublime Text (macOS)), `⌘ Z` (Xcode), `Ctrl+Z` (Visual Studio), `⌘ Z` (Visual Studio (macOS)), `Ctrl+Z` (ReSharper), `⌘ Z` (ReSharper (macOS)), `Ctrl+Z` (QtCreator), `⌘ Z` (QtCreator (macOS)), `Ctrl+Z` (NetBeans), `Ctrl+Z` (Eclipse), `⌘ Z` (Eclipse (macOS))/ `Ctrl+Shift+Z` (Windows), `⌘ ⇧ Z` (macOS), `⌘ ⇧ Z` (IntelliJ IDEA Classic (macOS)), `⌘ ⇧ Z` (macOS System Shortcuts), `Ctrl+Shift+Z` (XWin), `Ctrl+Shift+Z` (GNOME), `Ctrl+Shift+Z` (KDE), `Ctrl+Shift+Z` (Emacs), `Ctrl+Shift+Z` (Sublime Text), `⌘ Y` (Sublime Text (macOS)), `⌘ ⇧ Z` (Xcode), `Ctrl+Y` (Visual Studio), `⌘ Y` (Visual Studio (macOS)), `Ctrl+Y` (ReSharper), `⌘ Y` (ReSharper (macOS)), `Ctrl+Y` (QtCreator), `⌘ ⇧ Z` (QtCreator (macOS)), `Ctrl+Shift+Z` (NetBeans), `Ctrl+Y` (Eclipse), `⌘ ⇧ Z` (Eclipse (macOS))  |  使用此键盘快捷键撤销/重做合并操作。 冲突将与文本保持同步。  |

## See also

### 参考

[文件差异查看器](differences-viewer.html)

