https://github.com/sixarm/meld-with-3-windows

meld-with-3-windows: launch the meld merge tool with 3 windows
https://github.com/sixarm/meld-with-3-windows

git meld merge vcs

Last synced: 2 months ago
JSON representation

meld-with-3-windows: launch the meld merge tool with 3 windows

• Host: GitHub
• URL: https://github.com/sixarm/meld-with-3-windows
• Owner: SixArm
• Created: 2016-02-10T05:17:26.000Z (over 10 years ago)
• Default Branch: main
• Last Pushed: 2023-09-15T19:23:10.000Z (almost 3 years ago)
• Last Synced: 2025-02-06T00:28:24.423Z (over 1 year ago)
• Topics: git, meld, merge, vcs
• Language: Shell
• Homepage:
• Size: 4.88 KB
• Stars: 1
• Watchers: 2
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • Contributing: CONTRIBUTING.md
  • Code of conduct: CODE_OF_CONDUCT.md
  • Codeowners: CODEOWNERS

Awesome Lists containing this project

README

          
# meld-with-3-windows:
launch the meld merge tool with 3 windows

  * window 1: diff from BASE to LOCAL

  * window 2: diff from BASE to REMOTE

  * window 3: three-pane view

Meld is a visual diff and merge tool targeted at developers.

Meld helps you compare files, directories, and projects.

## Setup

To use this script, first add this to your gitconfig:

    [merge]

      tool = meld-with-3-windows

    [mergetool "meld-with-3-windows"]

      cmd = $HOME/bin/gitmerge $BASE $LOCAL $REMOTE $MERGED

See http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html