summaryrefslogtreecommitdiff
path: root/contrib/examples
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-24 13:48:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-24 13:48:53 -0700
commit6f37238747002b8118d92bc0ec6c986a5d7e56ad (patch)
tree40076791f6955066ea0d7c69cc176a13f17d4e0e /contrib/examples
parentMerge branch 'jk/doc-build-move-infordir-def' (diff)
parentmergetool--lib: refactor {diff,merge}_cmd logic (diff)
downloadtgif-6f37238747002b8118d92bc0ec6c986a5d7e56ad.tar.xz
Merge branch 'jk/mergetool-lib-refactor'
Code cleanup. * jk/mergetool-lib-refactor: mergetool--lib: refactor {diff,merge}_cmd logic
Diffstat (limited to 'contrib/examples')
0 files changed, 0 insertions, 0 deletions