From: Junio C Hamano <junkio@cox.net>
Date: Fri, 30 Mar 2007 06:08:45 +0000 (-0700)
Subject: Merge branch 'master' of git://repo.or.cz/git/mergetool.git
X-Git-Tag: v1.5.1~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=18acb3e6c76b42d109cac956d63a1c709b0d76b2;p=git.git

Merge branch 'master' of git://repo.or.cz/git/mergetool.git

* 'master' of git://repo.or.cz/git/mergetool.git:
  mergetool: Clean up description of files and prompts for merge resolutions
  mergetool: Make git-rm quiet when resolving a deleted file conflict
  mergetool: Add support for Apple Mac OS X's opendiff command
  mergetool: Fix abort command when resolving symlinks and deleted files
  mergetool: Remove spurious error message if merge.tool config option not set
  mergetool: factor out common code
  mergetool: portability fix: don't use reserved word function
  mergetool: portability fix: don't assume true is in /bin
  mergetool: Don't error out in the merge case where the local file is deleted
  mergetool: Replace use of "echo -n" with printf(1) to be more portable
  Fix minor formatting issue in man page for git-mergetool
---

18acb3e6c76b42d109cac956d63a1c709b0d76b2