git4idea: added tooltips to merge dialog
commitca517a0e8ddb0124f23f0576c3042bdc9b77858e
authorConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Fri, 24 Oct 2008 16:50:55 +0000 (24 20:50 +0400)
committerConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Fri, 24 Oct 2008 16:50:55 +0000 (24 20:50 +0400)
tree7fbe5bf231d35be977ff1fc5b34a3c4e324720d9
parentf78058c279b22e5c6aaf00c879665e96c082e345
git4idea: added tooltips to merge dialog
plugins/git4idea/src/git4idea/i18n/GitBundle.properties
plugins/git4idea/src/git4idea/merge/GitMergeDialog.form
plugins/git4idea/src/git4idea/merge/GitMergeDialog.java