├── .gitattributes ├── .github ├── FUNDING.yml ├── dependabot.yml ├── scripts │ └── ubuntu_install_tauri_dependencies.sh └── workflows │ ├── release.yml │ └── test.yml ├── .gitignore ├── .prettierignore ├── .prettierrc ├── AUTHORS ├── CHANGELOG.md ├── Cargo.lock ├── Cargo.toml ├── LICENSE ├── README.md ├── backend-tauri ├── .gitignore ├── Cargo.toml ├── build.rs ├── capabilities │ └── migrated.json ├── icons │ ├── icon.ico │ └── icon.png ├── src │ └── main.rs └── tauri.conf.json ├── diffedit3-0.1.2-screenshot.png ├── package.json ├── pyproject.toml ├── rustfmt.toml ├── src ├── bin │ └── diffedit3.rs ├── fs.rs ├── lib.rs ├── local_server.rs └── types.rs ├── testdata ├── README.md ├── edit │ ├── CHANGELOG.md │ ├── JJ-INSTRUCTIONS │ ├── cli │ │ ├── src │ │ │ └── commands │ │ │ │ └── config.rs │ │ └── tests │ │ │ ├── cli-reference@.md.snap │ │ │ └── test_config_command.rs │ └── docs │ │ └── config.md ├── left │ ├── CHANGELOG.md │ ├── cli │ │ ├── src │ │ │ └── commands │ │ │ │ └── config.rs │ │ └── tests │ │ │ ├── cli-reference@.md.snap │ │ │ └── test_config_command.rs │ └── docs │ │ └── config.md └── right │ ├── CHANGELOG.md │ ├── JJ-INSTRUCTIONS │ ├── cli │ ├── src │ │ └── commands │ │ │ └── config.rs │ └── tests │ │ ├── cli-reference@.md.snap │ │ └── test_config_command.rs │ └── docs │ └── config.md ├── uv.lock └── webapp ├── .gitignore ├── assets └── icons │ ├── Acknowledgements.md │ ├── de3-icon.svg │ ├── pin-outline.svg │ ├── pin.svg │ └── rightpane-icon.svg ├── dist ├── assets │ ├── de3-icon-PN-ohgop.svg │ ├── index-DOlhdiMt.css │ ├── index-MPhP5O05.js │ └── index-MPhP5O05.js.map └── index.html ├── index.html ├── package.json ├── src ├── backend_interactions.ts ├── diff_match_patch.d.ts ├── load_codemirror5_merge.ts ├── main.ts ├── merge_state.ts ├── styles.css └── utils.ts ├── tsconfig.json └── vite.config.ts /.gitattributes: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/.gitattributes -------------------------------------------------------------------------------- /.github/FUNDING.yml: -------------------------------------------------------------------------------- 1 | github: [ilyagr] 2 | -------------------------------------------------------------------------------- /.github/dependabot.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/.github/dependabot.yml -------------------------------------------------------------------------------- /.github/scripts/ubuntu_install_tauri_dependencies.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/.github/scripts/ubuntu_install_tauri_dependencies.sh -------------------------------------------------------------------------------- /.github/workflows/release.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/.github/workflows/release.yml -------------------------------------------------------------------------------- /.github/workflows/test.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/.github/workflows/test.yml -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/.gitignore -------------------------------------------------------------------------------- /.prettierignore: -------------------------------------------------------------------------------- 1 | .jj 2 | webapp/dist/ 3 | *.md 4 | -------------------------------------------------------------------------------- /.prettierrc: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /AUTHORS: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/AUTHORS -------------------------------------------------------------------------------- /CHANGELOG.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/CHANGELOG.md -------------------------------------------------------------------------------- /Cargo.lock: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/Cargo.lock -------------------------------------------------------------------------------- /Cargo.toml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/Cargo.toml -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/LICENSE -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/README.md -------------------------------------------------------------------------------- /backend-tauri/.gitignore: -------------------------------------------------------------------------------- 1 | /gen/schemas 2 | -------------------------------------------------------------------------------- /backend-tauri/Cargo.toml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/backend-tauri/Cargo.toml -------------------------------------------------------------------------------- /backend-tauri/build.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/backend-tauri/build.rs -------------------------------------------------------------------------------- /backend-tauri/capabilities/migrated.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/backend-tauri/capabilities/migrated.json -------------------------------------------------------------------------------- /backend-tauri/icons/icon.ico: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/backend-tauri/icons/icon.ico -------------------------------------------------------------------------------- /backend-tauri/icons/icon.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/backend-tauri/icons/icon.png -------------------------------------------------------------------------------- /backend-tauri/src/main.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/backend-tauri/src/main.rs -------------------------------------------------------------------------------- /backend-tauri/tauri.conf.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/backend-tauri/tauri.conf.json -------------------------------------------------------------------------------- /diffedit3-0.1.2-screenshot.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/diffedit3-0.1.2-screenshot.png -------------------------------------------------------------------------------- /package.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/package.json -------------------------------------------------------------------------------- /pyproject.toml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/pyproject.toml -------------------------------------------------------------------------------- /rustfmt.toml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/rustfmt.toml -------------------------------------------------------------------------------- /src/bin/diffedit3.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/src/bin/diffedit3.rs -------------------------------------------------------------------------------- /src/fs.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/src/fs.rs -------------------------------------------------------------------------------- /src/lib.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/src/lib.rs -------------------------------------------------------------------------------- /src/local_server.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/src/local_server.rs -------------------------------------------------------------------------------- /src/types.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/src/types.rs -------------------------------------------------------------------------------- /testdata/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/README.md -------------------------------------------------------------------------------- /testdata/edit/CHANGELOG.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/edit/CHANGELOG.md -------------------------------------------------------------------------------- /testdata/edit/JJ-INSTRUCTIONS: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/edit/JJ-INSTRUCTIONS -------------------------------------------------------------------------------- /testdata/edit/cli/src/commands/config.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/edit/cli/src/commands/config.rs -------------------------------------------------------------------------------- /testdata/edit/cli/tests/cli-reference@.md.snap: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/edit/cli/tests/cli-reference@.md.snap -------------------------------------------------------------------------------- /testdata/edit/cli/tests/test_config_command.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/edit/cli/tests/test_config_command.rs -------------------------------------------------------------------------------- /testdata/edit/docs/config.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/edit/docs/config.md -------------------------------------------------------------------------------- /testdata/left/CHANGELOG.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/left/CHANGELOG.md -------------------------------------------------------------------------------- /testdata/left/cli/src/commands/config.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/left/cli/src/commands/config.rs -------------------------------------------------------------------------------- /testdata/left/cli/tests/cli-reference@.md.snap: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/left/cli/tests/cli-reference@.md.snap -------------------------------------------------------------------------------- /testdata/left/cli/tests/test_config_command.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/left/cli/tests/test_config_command.rs -------------------------------------------------------------------------------- /testdata/left/docs/config.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/left/docs/config.md -------------------------------------------------------------------------------- /testdata/right/CHANGELOG.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/right/CHANGELOG.md -------------------------------------------------------------------------------- /testdata/right/JJ-INSTRUCTIONS: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/right/JJ-INSTRUCTIONS -------------------------------------------------------------------------------- /testdata/right/cli/src/commands/config.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/right/cli/src/commands/config.rs -------------------------------------------------------------------------------- /testdata/right/cli/tests/cli-reference@.md.snap: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/right/cli/tests/cli-reference@.md.snap -------------------------------------------------------------------------------- /testdata/right/cli/tests/test_config_command.rs: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/right/cli/tests/test_config_command.rs -------------------------------------------------------------------------------- /testdata/right/docs/config.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/testdata/right/docs/config.md -------------------------------------------------------------------------------- /uv.lock: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/uv.lock -------------------------------------------------------------------------------- /webapp/.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/.gitignore -------------------------------------------------------------------------------- /webapp/assets/icons/Acknowledgements.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/assets/icons/Acknowledgements.md -------------------------------------------------------------------------------- /webapp/assets/icons/de3-icon.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/assets/icons/de3-icon.svg -------------------------------------------------------------------------------- /webapp/assets/icons/pin-outline.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/assets/icons/pin-outline.svg -------------------------------------------------------------------------------- /webapp/assets/icons/pin.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/assets/icons/pin.svg -------------------------------------------------------------------------------- /webapp/assets/icons/rightpane-icon.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/assets/icons/rightpane-icon.svg -------------------------------------------------------------------------------- /webapp/dist/assets/de3-icon-PN-ohgop.svg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/dist/assets/de3-icon-PN-ohgop.svg -------------------------------------------------------------------------------- /webapp/dist/assets/index-DOlhdiMt.css: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/dist/assets/index-DOlhdiMt.css -------------------------------------------------------------------------------- /webapp/dist/assets/index-MPhP5O05.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/dist/assets/index-MPhP5O05.js -------------------------------------------------------------------------------- /webapp/dist/assets/index-MPhP5O05.js.map: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/dist/assets/index-MPhP5O05.js.map -------------------------------------------------------------------------------- /webapp/dist/index.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/dist/index.html -------------------------------------------------------------------------------- /webapp/index.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/index.html -------------------------------------------------------------------------------- /webapp/package.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/package.json -------------------------------------------------------------------------------- /webapp/src/backend_interactions.ts: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/src/backend_interactions.ts -------------------------------------------------------------------------------- /webapp/src/diff_match_patch.d.ts: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/src/diff_match_patch.d.ts -------------------------------------------------------------------------------- /webapp/src/load_codemirror5_merge.ts: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/src/load_codemirror5_merge.ts -------------------------------------------------------------------------------- /webapp/src/main.ts: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/src/main.ts -------------------------------------------------------------------------------- /webapp/src/merge_state.ts: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/src/merge_state.ts -------------------------------------------------------------------------------- /webapp/src/styles.css: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/src/styles.css -------------------------------------------------------------------------------- /webapp/src/utils.ts: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/src/utils.ts -------------------------------------------------------------------------------- /webapp/tsconfig.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/tsconfig.json -------------------------------------------------------------------------------- /webapp/vite.config.ts: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/ilyagr/diffedit3/HEAD/webapp/vite.config.ts --------------------------------------------------------------------------------