Remove the merging=2 case to simplify merge/nomerge logic.
authorZac Medico <zmedico@gentoo.org>
Sat, 8 Jul 2006 23:03:37 +0000 (23:03 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 8 Jul 2006 23:03:37 +0000 (23:03 -0000)
commit0ab656f11fc37f9c1f5a64d98ab03295432e26bf
tree6a2fc933b0c4dce71c4b7b15c86519207ea9d698
parentfa6929d819ba8a9befd43647ebbdaf5b6ba6e76c
Remove the merging=2 case to simplify merge/nomerge logic.

svn path=/main/trunk/; revision=3816
bin/emerge