git4idea: IDEADEV-36943: diff now works in UpdateInfo after pull and merge actions
authorConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Tue, 26 May 2009 15:04:45 +0000 (19:04 +0400)
committerConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Tue, 26 May 2009 15:04:45 +0000 (19:04 +0400)
commit698e25807e2299ac206066d34275a92090527fef
treebb6f97c8faaa622848fb1ca969f23111aaa17b79
parentba8f4f138ae78581774657b5979123cf5d33b25a
git4idea: IDEADEV-36943: diff now works in UpdateInfo after pull and merge actions
plugins/git4idea/git4idea.iml
plugins/git4idea/src/git4idea/actions/GitMerge.java
plugins/git4idea/src/git4idea/actions/GitPull.java
plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java
plugins/git4idea/src/git4idea/merge/GitMergeUtil.java