summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:34:08 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:34:08 -0800
commit540cc75f38c9787ed012fba81b2af365621b484b (patch)
tree3747e3f22f43926aee36fe330289973b600713c4 /Documentation/git-mergetool--lib.txt
parentMerge branch 'mm/mv-file-to-no-such-dir-with-slash' (diff)
parentshorten_unambiguous_ref(): tighten up pointer arithmetic (diff)
downloadtgif-540cc75f38c9787ed012fba81b2af365621b484b.tar.xz
Merge branch 'mh/shorten-unambigous-ref'
* mh/shorten-unambigous-ref: shorten_unambiguous_ref(): tighten up pointer arithmetic gen_scanf_fmt(): delete function and use snprintf() instead shorten_unambiguous_ref(): introduce a new local variable
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions