are there any nice Git merge conflict resolution tools that work in the terminal? when i look at the text merge conflict I can never remember which code is which, and I really want to see them side by side
it feels like someone must have written some kind of nice tool in Rust
Julia Evans
npub1hy…0avly
2026-06-15 20:08:40 UTC
Author Public Key
npub1hyjddt50dwcvjmtgr7t4czg4tt9j5xajavl0uvkt0v7wksx0460sp0avlySeen on
wss://relay.momostr.pinkPublished at
2026-06-15 20:08:40 UTCEvent JSON
{
"id": "604e137f978e03d926f48c5ce629153a8650ce1cfaffc8dfd6f4d733888ecc6e",
"pubkey": "b924d6ae8f6bb0c96d681f975c09155acb2a1bb2eb3efe32cb7b3ceb40cfae9f",
"created_at": 1781554120,
"kind": 1,
"tags": [
[
"proxy",
"https://social.jvns.ca/@b0rk/116755930869747225",
"web"
],
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/116755930869747225",
"activitypub"
],
[
"L",
"pink.momostr"
],
[
"l",
"pink.momostr.activitypub:https://social.jvns.ca/users/b0rk/statuses/116755930869747225",
"pink.momostr"
],
[
"-"
]
],
"content": "are there any nice Git merge conflict resolution tools that work in the terminal? when i look at the text merge conflict I can never remember which code is which, and I really want to see them side by side\n\nit feels like someone must have written some kind of nice tool in Rust",
"sig": "e3989ed44f85bb7ec035796ee2bd49ebd1b0198b632ef96dc6bc6c26da0ee5705594f303e69d21d5db913d0745a93503b8d5fd3dbeec47c865b2345b9221da44"
}