| commit | ba56d7057a5da9eb3485391658ba7465c855a8f3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Feb 2013 18:29:37 +0000 (14 10:29 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Feb 2013 18:29:37 +0000 (14 10:29 -0800) | ||
| tree | a0773d7dc3fcc6c91e1df1fc34098e203bf9e37e | treesnapshot (tar.gz zip) |
| parent | 393b7c3cd7c87a42e2e477de38d4a6e4981db8bb | commitdiff |
| parent | 2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5 | commitdiff |
Merge branch 'al/mergetool-printf-fix'
* al/mergetool-printf-fix:
difftool--helper: fix printf usage
git-mergetool: print filename when it contains %
* al/mergetool-printf-fix:
difftool--helper: fix printf usage
git-mergetool: print filename when it contains %
| git-mergetool.sh | diff1 | diff2 | blobhistory |