Bug fix: Restore pull-up functionality of bit merging

Test case: Used to merge two 1-bit control path signals into a 2-bit signal. Typically using the AB and B inputs on the split-merge.

Author: Edward Nutting

src/com/modsim/util/BinData.java

@@ -243,11 +243,8 @@ else if (b0 == 2) {
         else if (b1 == 2) {
             return b0;
         }
-        else if (b0 == b1) {
-            return b0;
-        }
         else {
-            return 2;
+            return b0 | b1;
         }
     }
 }