Thread (6 messages) 6 messages, 2 authors, 2016-06-15

Re: [PATCH 0/3] Improvements to mergetool-lib

flat view

From: Charles Bailey <hidden>
Date: 2016-06-15 22:50:04

On 18/11/2010 10:40, Sebastian Schuberth wrote:
This small series adds Beyond Compare 3 as a diff / merge tool
and performs some minor improvements.

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                  |  243 +++++++++++++++++---------------
  6 files changed, 195 insertions(+), 167 deletions(-)
I'm not an ecmerge or Beyond Compare user. The reordering of tools makes for a bit of a messy diff but I think it makes sense.

This series looks good to me. Has it been well tested?

Charles.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help