src/hg/hgTables/compositeTrack.c 1.20

Index: src/hg/hgTables/compositeTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/compositeTrack.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -B -U 4 -r1.19 -r1.20
--- src/hg/hgTables/compositeTrack.c	11 May 2010 01:43:25 -0000	1.19
+++ src/hg/hgTables/compositeTrack.c	3 Jun 2010 18:53:59 -0000	1.20
@@ -169,9 +169,9 @@
 hCompositeUi(database, cart, curTrack, curTable, hgtaDoSubtrackMergePage, "mainForm");
 
 hPrintf("<H3>Select a merge operation:</H3>\n");
 struct trackDb *primary = subTdbFind(curTrack,curTable);
-if (isWiggle(database, curTable) || isBedGraph(curTable) || isBigWig(curTable))
+if (isWiggle(database, curTable) || isBedGraph(curTable) || isBigWigTable(curTable))
     showWiggleMergeOptions(primary->longLabel);
 else
     showBedMergeOptions();
 hPrintf("If a filter is specified on the main Table Browser page, it will "
@@ -197,9 +197,9 @@
 dyStringPrintf(dy, "Subtrack merge, primary table = %s (%s)\n",
 	       curTable, primary->longLabel);
 dyStringAppend(dy, linePrefix);
 dyStringPrintf(dy, "Subtrack merge operation: ");
-if (isWiggle(database, curTable) || isBedGraph(curTable) || isBigWig(curTable))
+if (isWiggle(database, curTable) || isBedGraph(curTable) || isBigWigTable(curTable))
     {
     char *op = cartString(cart, hgtaSubtrackMergeWigOp);
     dyStringPrintf(dy, "%s of %s and selected subtracks:\n", op, curTable);
     }