git/list[1] front-page[2] threads[3] people[4] search[5] about
 

easily use meld 3-pane view to review merge commits?

From
Britton Kerin <britton.kerin@gmail.com>
Date
May 3, 2025, 21:55 UTC
Message-ID
<CAC4O8c9OJQQn_22i0-bZUDtHoi+ti6aT6FwupnQBoBFg6BNK6w@mail.gmail.com>
I like how git-mergetool can use meld with 3 pane view to see merge conflicts:
  git mergetool --tool=meld

I'd like to use the same sort of view to see already-committed merges, but I didn't find an easy way to do it. It seems like git-diff, git-difftool and git-show are oriented entirely towards diff or 2-pane view rather than diff3/3-pane that git-mergetool uses. Did I miss the existing functionality somehow?

I asked about this on stackoverflow and made an answer with a script also:
  https://stackoverflow.com/questions/79599180/show-a-git-merge-commit-in-three-panel-form-inimeld

If there isn't any existing automatic way to inspect merge commits in this way I'd like to improve this script and turn it into git-meld3 or something. It's tempting to think it could be wedged into the existing diff-oriented architecture of git-diff/difftool/show but the result would probably be too confusing to be useful.

Britton
Next: Johannes Sixt
Message 1 of 3 in “easily use meld 3-pane view to review merge commits?”
  1. Britton KerinMay 3, 2025
  2. Johannes SixtMay 4, 2025
  3. D. Ben KnobleMay 9, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.