├── .github └── workflows │ └── main.yml ├── .gitignore ├── COPYING ├── README.md ├── bin └── git-meld-index-run-merge-tool ├── ci ├── Dockerfile └── Dockerfile.debian ├── doc ├── asciidoc.conf ├── git-meld-index.1 ├── git-meld-index.txt ├── manpage-base.xsl ├── manpage-normal.xsl └── manpage-quote-apos.xml ├── release.py ├── setup.py └── src ├── git_meld_index.py ├── golden ├── assert_golden_file │ ├── test_write_index_or_head │ ├── test_write_index_or_head_executable │ ├── test_write_index_or_head_in_progress_merge │ ├── test_write_index_or_head_in_progress_rebase │ ├── test_write_index_or_head_in_progress_submodule │ ├── test_write_index_or_head_submodule_with_changes │ ├── test_write_index_or_head_symlink │ ├── test_write_stageable_working_tree_subset │ └── test_write_stageable_working_tree_subset_symlink ├── test │ ├── melded │ │ ├── cached │ │ ├── diff │ │ └── untracked │ └── unmelded │ │ ├── cached │ │ ├── diff │ │ └── untracked └── test_dirs │ ├── melded │ ├── cached │ ├── diff │ └── untracked │ └── unmelded │ ├── cached │ ├── diff │ └── untracked ├── list_tree.py └── test_git_meld_index.py /.github/workflows/main.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/.github/workflows/main.yml -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/.gitignore -------------------------------------------------------------------------------- /COPYING: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/COPYING -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/README.md -------------------------------------------------------------------------------- /bin/git-meld-index-run-merge-tool: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/bin/git-meld-index-run-merge-tool -------------------------------------------------------------------------------- /ci/Dockerfile: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/ci/Dockerfile -------------------------------------------------------------------------------- /ci/Dockerfile.debian: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/ci/Dockerfile.debian -------------------------------------------------------------------------------- /doc/asciidoc.conf: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/doc/asciidoc.conf -------------------------------------------------------------------------------- /doc/git-meld-index.1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/doc/git-meld-index.1 -------------------------------------------------------------------------------- /doc/git-meld-index.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/doc/git-meld-index.txt -------------------------------------------------------------------------------- /doc/manpage-base.xsl: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/doc/manpage-base.xsl -------------------------------------------------------------------------------- /doc/manpage-normal.xsl: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/doc/manpage-normal.xsl -------------------------------------------------------------------------------- /doc/manpage-quote-apos.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/doc/manpage-quote-apos.xml -------------------------------------------------------------------------------- /release.py: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/release.py -------------------------------------------------------------------------------- /setup.py: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/setup.py -------------------------------------------------------------------------------- /src/git_meld_index.py: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/git_meld_index.py -------------------------------------------------------------------------------- /src/golden/assert_golden_file/test_write_index_or_head: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/assert_golden_file/test_write_index_or_head -------------------------------------------------------------------------------- /src/golden/assert_golden_file/test_write_index_or_head_executable: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/assert_golden_file/test_write_index_or_head_executable -------------------------------------------------------------------------------- /src/golden/assert_golden_file/test_write_index_or_head_in_progress_merge: -------------------------------------------------------------------------------- 1 | 2 | -------------------------------------------------------------------------------- /src/golden/assert_golden_file/test_write_index_or_head_in_progress_rebase: -------------------------------------------------------------------------------- 1 | 2 | -------------------------------------------------------------------------------- /src/golden/assert_golden_file/test_write_index_or_head_in_progress_submodule: -------------------------------------------------------------------------------- 1 | |-- .gitmodules 2 | `-- sub/ 3 | -------------------------------------------------------------------------------- /src/golden/assert_golden_file/test_write_index_or_head_submodule_with_changes: -------------------------------------------------------------------------------- 1 | 2 | -------------------------------------------------------------------------------- /src/golden/assert_golden_file/test_write_index_or_head_symlink: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/assert_golden_file/test_write_index_or_head_symlink -------------------------------------------------------------------------------- /src/golden/assert_golden_file/test_write_stageable_working_tree_subset: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/assert_golden_file/test_write_stageable_working_tree_subset -------------------------------------------------------------------------------- /src/golden/assert_golden_file/test_write_stageable_working_tree_subset_symlink: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/assert_golden_file/test_write_stageable_working_tree_subset_symlink -------------------------------------------------------------------------------- /src/golden/test/melded/cached: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/test/melded/cached -------------------------------------------------------------------------------- /src/golden/test/melded/diff: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/test/melded/diff -------------------------------------------------------------------------------- /src/golden/test/melded/untracked: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /src/golden/test/unmelded/cached: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/test/unmelded/cached -------------------------------------------------------------------------------- /src/golden/test/unmelded/diff: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/test/unmelded/diff -------------------------------------------------------------------------------- /src/golden/test/unmelded/untracked: -------------------------------------------------------------------------------- 1 | deleted_from_index 2 | untracked 3 | -------------------------------------------------------------------------------- /src/golden/test_dirs/melded/cached: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/test_dirs/melded/cached -------------------------------------------------------------------------------- /src/golden/test_dirs/melded/diff: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/test_dirs/melded/diff -------------------------------------------------------------------------------- /src/golden/test_dirs/melded/untracked: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /src/golden/test_dirs/unmelded/cached: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/test_dirs/unmelded/cached -------------------------------------------------------------------------------- /src/golden/test_dirs/unmelded/diff: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/test_dirs/unmelded/diff -------------------------------------------------------------------------------- /src/golden/test_dirs/unmelded/untracked: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/golden/test_dirs/unmelded/untracked -------------------------------------------------------------------------------- /src/list_tree.py: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/list_tree.py -------------------------------------------------------------------------------- /src/test_git_meld_index.py: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/jjlee/git-meld-index/HEAD/src/test_git_meld_index.py --------------------------------------------------------------------------------