* fix automerge regression
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Fri, 15 Jul 2011 18:16:02 +0000 (20:16 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Fri, 15 Jul 2011 18:16:02 +0000 (20:16 +0200)
commit5086bd5664a0b7d60ed8aae757bf0312d9f159e4
treec37ba0f423d5f6e0921ffc5137ff5458410b66d1
parent2c5617709d229f167d6f2b871d5abf7dbb827964
* fix automerge regression
src/environment.cpp