Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23)
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest3 patches 4 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | mergetool--lib: Sort tools alphabetically for easier lookupDocumentation/ Documentation/ Documentation/ +2 more | +177 | 0 replies | |
| 2/3 | mergetool--lib: Add Beyond Compare 3 as a toolDocumentation/ Documentation/ Documentation/ +3 more | +31 | 0 replies | |
| 3/3 | mergetool--lib: Add the proper executable name for ECMergegit-mergetool--lib.sh | +3 | 3 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/3] Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23)
This is the follow-up to
http://marc.info/?l=git&m=129871641232007&w=2
and an alternative to the proposed
cp/mergetool-beyondcompare
Sebastian Schuberth (3):
mergetool--lib: Sort tools alphabetically for easier lookup
mergetool--lib: Add Beyond Compare 3 as a tool
mergetool--lib: Add the proper executable name for ECMerge
Documentation/git-difftool.txt | 4 +- Documentation/git-mergetool.txt | 4 +- Documentation/merge-config.txt | 8 +- contrib/completion/git-completion.bash | 2 +- git-gui/lib/mergetool.tcl | 101 +++++++------ git-mergetool--lib.sh | 250 +++++++++++++++++--------------- 6 files changed, 198 insertions(+), 171 deletions(-)
Signature · 1 line
1.7.3.2.msysgit.6.dirty