| commit | b79faa99e6c4eac658130c5b6291dc0145164293 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 16:04:01 +0000 (25 08:04 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 16:04:01 +0000 (25 08:04 -0800) | ||
| tree | 4cc1bee7dd2909ccf5f69500533173faf072ccb0 | treesnapshot (tar.gz zip) |
| parent | 75288cc7e120cfcce4b11699d034bcadccdf9344 | commitdiff |
| parent | 2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5 | commitdiff |
Merge branch 'al/mergetool-printf-fix' into maint
* 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 %