tree a182f8c03b8ef6c365d9ffd33e82f054739b7ba7
parent eee5cda2c8be4957b8e2e5fe1cd1bb42e2d4edcf
author Zac Medico <zmedico@gentoo.org> 1301265467 -0700
committer Zac Medico <zmedico@gentoo.org> 1301265467 -0700

display_merge: tweak background/logging logic