| commit | 5f9bc4e43c900edebfc979f92f1beb03d3d1a1b4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Feb 2013 19:31:38 +0000 (11 11:31 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Feb 2013 19:31:39 +0000 (11 11:31 -0800) | ||
| tree | 011b09290d66518eca066e6a02f83138289b638b | treesnapshot (tar.gz zip) |
| parent | ba8dba38171761f7bce416db39d32432e6954a51 | commitdiff |
| parent | 2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5 | commitdiff |
Merge branch 'al/mergetool-printf-fix' into next
* 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 |