]> git.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 393b7c3 2a9ccff)
Merge branch 'al/mergetool-printf-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 18:29:37 +0000 (10:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 18:29:37 +0000 (10:29 -0800)
* al/mergetool-printf-fix:
  difftool--helper: fix printf usage
  git-mergetool: print filename when it contains %

1  2 
git-mergetool.sh patch | diff1 | diff2 | blob | history

diff --cc git-mergetool.sh
Simple merge
mirror of git://git.kernel.org/pub/scm/git/git.git