git4idea: Fixed options on merge and pull dialogs to better reflect git option depend...
commita68c2164669c256ebc81ffa320e52324418fecc0
authorConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Fri, 5 Jun 2009 14:30:02 +0000 (5 18:30 +0400)
committerConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Fri, 5 Jun 2009 14:30:02 +0000 (5 18:30 +0400)
tree4e74adac8636e288d1a79e7d28797db0bae2d612
parentf8ef5ac9139b94f51ddcea68451ff6943fc30740
git4idea: Fixed options on merge and pull dialogs to better reflect git option dependencies
plugins/git4idea/src/git4idea/merge/GitMergeDialog.java
plugins/git4idea/src/git4idea/merge/GitMergeUtil.java
plugins/git4idea/src/git4idea/merge/GitPullDialog.java
plugins/git4idea/src/git4idea/ui/GitUIUtil.java