On Tue, Dec 08, 2009 at 12:01:17PM -0800, Jay Soffian wrote: > Add SourceGear DiffMerge to the set of built-in diff/merge tools, and update > bash completion and documentation. > --- > Documentation/git-difftool.txt | 2 +- > Documentation/git-mergetool.txt | 2 +- > Documentation/merge-config.txt | 4 ++-- > contrib/completion/git-completion.bash | 2 +- > git-mergetool--lib.sh | 22 ++++++++++++++++++++-- > 5 files changed, 25 insertions(+), 7 deletions(-) I'm not a diffmerge user but the patch looks fine to me. Is diffmerge free but not Free? Any reason for holding back on sign-off? Charles. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html