├── LICENSE ├── autoload └── mergetool.vim ├── plugin └── mergetool.vim ├── readme.md └── screenshots ├── airline_merge_indicator.png ├── bmr_3splits_layout.png ├── bmr_mixed_layout.png ├── diff_exchange.png ├── layout_advanced_customization.png ├── mergetool_mr_2way_default_layout.png ├── quit_prompt.png ├── toggle_layout_1.png ├── toggle_layout_2.png ├── toggle_layout_3.png ├── toggle_layouts.png └── vimdiff_default_tool.png /LICENSE: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/LICENSE -------------------------------------------------------------------------------- /autoload/mergetool.vim: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/autoload/mergetool.vim -------------------------------------------------------------------------------- /plugin/mergetool.vim: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/plugin/mergetool.vim -------------------------------------------------------------------------------- /readme.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/readme.md -------------------------------------------------------------------------------- /screenshots/airline_merge_indicator.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/airline_merge_indicator.png -------------------------------------------------------------------------------- /screenshots/bmr_3splits_layout.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/bmr_3splits_layout.png -------------------------------------------------------------------------------- /screenshots/bmr_mixed_layout.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/bmr_mixed_layout.png -------------------------------------------------------------------------------- /screenshots/diff_exchange.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/diff_exchange.png -------------------------------------------------------------------------------- /screenshots/layout_advanced_customization.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/layout_advanced_customization.png -------------------------------------------------------------------------------- /screenshots/mergetool_mr_2way_default_layout.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/mergetool_mr_2way_default_layout.png -------------------------------------------------------------------------------- /screenshots/quit_prompt.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/quit_prompt.png -------------------------------------------------------------------------------- /screenshots/toggle_layout_1.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/toggle_layout_1.png -------------------------------------------------------------------------------- /screenshots/toggle_layout_2.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/toggle_layout_2.png -------------------------------------------------------------------------------- /screenshots/toggle_layout_3.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/toggle_layout_3.png -------------------------------------------------------------------------------- /screenshots/toggle_layouts.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/toggle_layouts.png -------------------------------------------------------------------------------- /screenshots/vimdiff_default_tool.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/samoshkin/vim-mergetool/HEAD/screenshots/vimdiff_default_tool.png --------------------------------------------------------------------------------