Merge lp:~markgius/bzr-extmerge/git-mergetool-support into lp:~zindar/bzr-extmerge/trunk
Proposed by
Mark Gius
Status: | Needs review |
---|---|
Proposed branch: | lp:~markgius/bzr-extmerge/git-mergetool-support |
Merge into: | lp:~zindar/bzr-extmerge/trunk |
Diff against target: |
15 lines (+4/-1) 1 file modified
extmerge.py (+4/-1) |
To merge this branch: | bzr merge lp:~markgius/bzr-extmerge/git-mergetool-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Fred McCann (community) | Disapprove | ||
Jelmer Vernooij (community) | code | Approve | |
Erik Bågfors | Pending | ||
Review via email: mp+63414@code.launchpad.net |
Commit message
Adds accepted configuration for git-mergetool style merging.
Description of the change
Adds accepted configuration for git-mergetool style merging.
Left is local committed copy, middle is merged copy with markers, right is remote copy. This config works extremely well with vimdiff.
To post a comment you must log in.
Looks reasonable to me (though I'm not a bzr-extmerge maintainer)