git4idea: In pull and merge dialogs message text and log info options are disabled...
commitb3b0c5789eb4daf46b5a97eeb6665c5c1dd20fdb
authorConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Fri, 5 Jun 2009 14:44:45 +0000 (5 18:44 +0400)
committerConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Fri, 5 Jun 2009 14:44:45 +0000 (5 18:44 +0400)
treea2d3d3bf50e3867a1344b793ace140107af33257
parent282e798b62d94ee6783455fbb7a1e82ceb516235
git4idea: In pull and merge dialogs message text and log info options are disabled if squash option is selected since they are not used anyway.
plugins/git4idea/src/git4idea/merge/GitMergeDialog.java
plugins/git4idea/src/git4idea/merge/GitPullDialog.java
plugins/git4idea/src/git4idea/ui/GitUIUtil.java