From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Aug 2012 18:55:16 +0000 (-0700)
Subject: Merge branch 'da/difftool-updates'
X-Git-Tag: v1.8.0-rc0~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de54ef2724882f151d71f996991b4c634b6abf41;p=git

Merge branch 'da/difftool-updates'

"git difftool --dir-diff" learned to use symbolic links to prepare
temporary copy of the working tree when available.

* da/difftool-updates:
  difftool: silence warning
  Add Code Compare v2.80.4 as a merge / diff tool for Windows
  mergetool,difftool: Document --tool-help consistently
  difftool: Disable --symlinks on cygwin
  difftool: Handle compare() returning -1
  difftool: Wrap long lines for readability
  difftool: Check all return codes from compare()
  difftool: Handle finding mergetools/ in a path with spaces
  difftool: Use symlinks when diffing against the worktree
  difftool: Call the temp directory "git-difftool"
  difftool: Move option values into a hash
  difftool: Eliminate global variables
  difftool: Simplify print_tool_help()
---

de54ef2724882f151d71f996991b4c634b6abf41
diff --cc contrib/completion/git-completion.bash
index ffedce751c,820ac738c6..222b804ce4
mode 100644,100755..100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash