IDEA-96602 Show correct tooltip in the Pull dialog

6268ace7 · Dmitriy Smirnov · 588a8d5e · 6268ace7
Commit 6268ace7 authored 6 years ago by Dmitriy Smirnov
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 1 deletion
+1 -1
--- a/plugins/git4idea/src/git4idea/merge/GitPullDialog.form
+++ b/plugins/git4idea/src/git4idea/merge/GitPullDialog.form
@@ -78,7 +78,7 @@
          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
        </constraints>
        <properties>
-          <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="merge.strategy"/>
+          <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="merge.strategy.tooltip"/>
        </properties>
      </component>
      <grid id="f2617" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">