├── .gitignore ├── LICENSE ├── Makefile ├── README.md ├── doc ├── default-conflict-markers.png ├── diff-view.png ├── history-view.png └── jj-diffconflicts.txt ├── lua └── jj-diffconflicts │ ├── health.lua │ └── init.lua ├── plugin └── jj_diffconflicts.lua ├── scripts ├── make-conflicts.sh └── run_tests.lua └── tests ├── data ├── base ├── fruits.txt ├── left ├── long_markers.txt ├── missing_newline_markers.txt ├── multiple_conflicts.txt └── right ├── screenshots ├── fruits_ui ├── long_markers_ui ├── missing_newline_ui ├── multiple_conflicts_ui ├── no_usage_message ├── tests-test_jj_diffconflicts.lua---history-view---displays-UI ├── tests-test_jj_diffconflicts.lua---run---displays-an-error-when-no-valid-conflict └── tests-test_jj_diffconflicts.lua---run---does-not-work-with-wrong-marker-length ├── test_internal.lua └── test_jj_diffconflicts.lua /.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/.gitignore -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/LICENSE -------------------------------------------------------------------------------- /Makefile: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/Makefile -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/README.md -------------------------------------------------------------------------------- /doc/default-conflict-markers.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/doc/default-conflict-markers.png -------------------------------------------------------------------------------- /doc/diff-view.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/doc/diff-view.png -------------------------------------------------------------------------------- /doc/history-view.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/doc/history-view.png -------------------------------------------------------------------------------- /doc/jj-diffconflicts.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/doc/jj-diffconflicts.txt -------------------------------------------------------------------------------- /lua/jj-diffconflicts/health.lua: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/lua/jj-diffconflicts/health.lua -------------------------------------------------------------------------------- /lua/jj-diffconflicts/init.lua: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/lua/jj-diffconflicts/init.lua -------------------------------------------------------------------------------- /plugin/jj_diffconflicts.lua: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/plugin/jj_diffconflicts.lua -------------------------------------------------------------------------------- /scripts/make-conflicts.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/scripts/make-conflicts.sh -------------------------------------------------------------------------------- /scripts/run_tests.lua: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/scripts/run_tests.lua -------------------------------------------------------------------------------- /tests/data/base: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/data/base -------------------------------------------------------------------------------- /tests/data/fruits.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/data/fruits.txt -------------------------------------------------------------------------------- /tests/data/left: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/data/left -------------------------------------------------------------------------------- /tests/data/long_markers.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/data/long_markers.txt -------------------------------------------------------------------------------- /tests/data/missing_newline_markers.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/data/missing_newline_markers.txt -------------------------------------------------------------------------------- /tests/data/multiple_conflicts.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/data/multiple_conflicts.txt -------------------------------------------------------------------------------- /tests/data/right: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/data/right -------------------------------------------------------------------------------- /tests/screenshots/fruits_ui: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/screenshots/fruits_ui -------------------------------------------------------------------------------- /tests/screenshots/long_markers_ui: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/screenshots/long_markers_ui -------------------------------------------------------------------------------- /tests/screenshots/missing_newline_ui: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/screenshots/missing_newline_ui -------------------------------------------------------------------------------- /tests/screenshots/multiple_conflicts_ui: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/screenshots/multiple_conflicts_ui -------------------------------------------------------------------------------- /tests/screenshots/no_usage_message: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/screenshots/no_usage_message -------------------------------------------------------------------------------- /tests/screenshots/tests-test_jj_diffconflicts.lua---history-view---displays-UI: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/screenshots/tests-test_jj_diffconflicts.lua---history-view---displays-UI -------------------------------------------------------------------------------- /tests/screenshots/tests-test_jj_diffconflicts.lua---run---displays-an-error-when-no-valid-conflict: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/screenshots/tests-test_jj_diffconflicts.lua---run---displays-an-error-when-no-valid-conflict -------------------------------------------------------------------------------- /tests/screenshots/tests-test_jj_diffconflicts.lua---run---does-not-work-with-wrong-marker-length: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/screenshots/tests-test_jj_diffconflicts.lua---run---does-not-work-with-wrong-marker-length -------------------------------------------------------------------------------- /tests/test_internal.lua: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/test_internal.lua -------------------------------------------------------------------------------- /tests/test_jj_diffconflicts.lua: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rafikdraoui/jj-diffconflicts/HEAD/tests/test_jj_diffconflicts.lua --------------------------------------------------------------------------------