git4idea: IDEADEV-34369
commit8b9bab0b5e232abbdcb26222252df0c5b6c63cae
authorConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Thu, 29 Jan 2009 14:55:12 +0000 (29 17:55 +0300)
committerConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Thu, 29 Jan 2009 14:55:12 +0000 (29 17:55 +0300)
tree94cf98d13a5dd832bc3f8bc95d446251c70c2e78
parentd4534770d86d08961265a88c902d78951d2b8645
git4idea: IDEADEV-34369
plugins/git4idea/src/git4idea/GitFileRevision.java
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java