GitMergeUpdater: fix swapped local/server versions, extract method from GitTask.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sat, 19 Mar 2011 12:46:09 +0000 (15:46 +0300)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sat, 19 Mar 2011 12:46:09 +0000 (15:46 +0300)
commite8adc64f09be50edb0513b0d2eadbb67896851eb
tree44391d39438dd684c17c97ca1f4fb3f219239510
parentc8e2c2bcc606e6c5695e500ec2c466e52eb40281
GitMergeUpdater: fix swapped local/server versions, extract method from GitTask.
plugins/git4idea/src/git4idea/update/GitMergeUpdater.java