fix conflicts

src/kit/shell/src/shellCheck.c

@@ -196,4 +196,4 @@ void shellCheck(TAOS *con, SShellArguments *args) {
   int64_t end = taosGetTimestampMs();
   fprintf(stdout, "total %d tables checked, failed:%d, time spent %.2f seconds\n", checkedNum, errorNum,
           (end - start) / 1000.0);
-}
+}

src/kit/shell/src/shellEngine.c

@@ -417,7 +417,7 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
 #ifdef WINDOWS
   if (tt < 0) tt = 0;
 #endif
-  if (tt <= 0 && ms != 0) {
+  if (tt <= 0 && ms < 0) {
     tt--;
     if (precision == TSDB_TIME_PRECISION_MICRO) {
       ms += 1000000;