New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git merge tool #11

Closed

WilliamHsieh opened this issue Nov 25, 2023 · 1 comment

Labels

draft

Owner

WilliamHsieh commented Nov 25, 2023

merge tool for conflicts
-- https://github.com/sindrets/diffview.nvim
-- https://github.com/rhysd/conflict-marker.vim
-- https://github.com/tpope/vim-fugitive/
-- http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/
-- https://github.com/samoshkin/vim-mergetool

WilliamHsieh added the draft label

Owner Author

WilliamHsieh commented Sep 20, 2024

fixed by 4a50509

WilliamHsieh closed this as completed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment