]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75288cc 2a9ccff)
Merge branch 'al/mergetool-printf-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:01 +0000 (08:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:01 +0000 (08:04 -0800)
* al/mergetool-printf-fix:
  difftool--helper: fix printf usage
  git-mergetool: print filename when it contains %


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.