resolved merge conflicts

2026-09-22 11:29:24 +08:00 · 2017-02-16 13:17:33 -05:00
parent 6ebf0ebd3a 660eedafa3
commit 8199c1816f
15 changed files with 85 additions and 89 deletions
@@ -281,7 +281,7 @@ stat_t mp_exec_move()
            if (bf->buffer_state == MP_BUFFER_PREPPED) {
                if (cm->motion_state == MOTION_RUN) {
 #if IN_DEBUGGER == 1
-                    __asm__("BKPT"); // we are running but don't have a block planned
+//                    __asm__("BKPT"); // we are running but don't have a block planned
 #endif
                }
                // We need to have it planned. We don't want to do this here, as it