diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:29:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:29:37 -0800 |
| commit | ba56d7057a5da9eb3485391658ba7465c855a8f3 (patch) | |
| tree | a0773d7dc3fcc6c91e1df1fc34098e203bf9e37e /userdiff.c | |
| parent | Merge branch 'jk/error-const-return' (diff) | |
| parent | difftool--helper: fix printf usage (diff) | |
| download | tgif-ba56d7057a5da9eb3485391658ba7465c855a8f3.tar.xz | |
Merge branch 'al/mergetool-printf-fix'
* al/mergetool-printf-fix:
difftool--helper: fix printf usage
git-mergetool: print filename when it contains %
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions