Git: dont gather extra changes by diffs for merge commits
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 14 Apr 2010 07:11:52 +0000 (11:11 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 14 Apr 2010 07:11:52 +0000 (11:11 +0400)
commit3b98b199c82ec1951be8ec01299e0c55e529ce00
treee17009d5ecd512b89a1da0543f29fc82b05fd881
parentf3bc93eb3afe975c90a2c3a3d08144d38fd8a8f9
Git: dont gather extra changes by diffs for merge commits
plugins/git4idea/src/git4idea/GitUtil.java
plugins/git4idea/src/git4idea/GitVcs.java
plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java
plugins/git4idea/src/git4idea/changes/GitChangeUtils.java
plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java
plugins/git4idea/src/git4idea/history/browser/GitTreeController.java