git4idea: Added blocking project update until unstashed merge resolves.
commit8b7c2730b59144d497df096dedd3b52e3a1a5086
authorConstantine Plotnikov <constantine.plotnikov@gmail.com>
Wed, 30 Sep 2009 18:25:30 +0000 (30 22:25 +0400)
committerConstantine Plotnikov <constantine.plotnikov@gmail.com>
Wed, 30 Sep 2009 18:25:30 +0000 (30 22:25 +0400)
tree34e114d33c9a1933a1168f6ac44b24926f24758e
parent2715cad3ead0972189675287dad0be8bb9f7d929
git4idea: Added blocking project update until unstashed merge resolves.
plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java