Merge remote-tracking branch 'origin/main' into feat/changes-md-reading
# Conflicts: # src/client/changes/DiffPane.tsx # src/client/locales-ar.ts # src/client/locales-de.ts # src/client/locales-fr.ts # src/client/locales-hi.ts # src/client/locales-id.ts # src/client/locales-it.ts # src/client/locales-ja.ts # src/client/locales-ko.ts # src/client/locales-nl.ts # src/client/locales-pl.ts # src/client/locales-pt.ts # src/client/locales-ru.ts # src/client/locales-sv.ts # src/client/locales-th.ts # src/client/locales-tr.ts # src/client/locales-vi.ts # src/client/locales-zh-HK.ts # src/client/locales-zh-MO.ts # src/client/locales-zh-TW.ts
This commit is contained in:
@@ -16,7 +16,8 @@ import { api, type GitStatusResult, type GitWorktree } from '../src/client/api.t
|
||||
import type { Context } from '../src/context-types.ts'
|
||||
import type { SidebarTab } from '../src/client/state.ts'
|
||||
|
||||
;(globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true
|
||||
import { setupReactAct } from './test-utils.ts'
|
||||
setupReactAct()
|
||||
|
||||
const MAIN = 'C:/repo/main'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user