git4idea: IDEADEV-36657: now only files that might have been affected by the merge...
commitdd42e9917e734a66249c96a5e7c0306faacbb7c2
authorConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Wed, 13 May 2009 17:29:57 +0000 (13 21:29 +0400)
committerConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Wed, 13 May 2009 17:29:57 +0000 (13 21:29 +0400)
treecae090f353a559a881caf9b9ec5b8e7ec8fa49cb
parentff3802fa01ca84398a9fe982e7776fdfbb9b7312
git4idea: IDEADEV-36657: now only files that might have been affected by the merge are considered for Merge Info and Update Info
plugins/git4idea/src/git4idea/changes/ChangeCollector.java
plugins/git4idea/src/git4idea/config/GitConfigUtil.java
plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java