fix conflicts

c98285e0 · Shengliang Guan · ea3cde91 · c98285e0 · c98285e0
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

src/kit/shell/src/shellCheck.c src/kit/shell/src/shellCheck.c +1 -1

src/kit/shell/src/shellEngine.c src/kit/shell/src/shellEngine.c +1 -1

未找到文件。
--- a/src/kit/shell/src/shellCheck.c
+++ b/src/kit/shell/src/shellCheck.c
--- a/src/kit/shell/src/shellEngine.c
+++ b/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;