summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-05-14 13:34:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-14 13:34:23 -0700
commit29182f7da4b31b11f82281a9a03edd082975dceb (patch)
treef8a9041662996ce52c3532294fc52f9ea8328e08 /builtin-merge-file.c
parentMerge branch 'jk/renamelimit' (early part) (diff)
parentDocumentation: rename "hooks.txt" to "githooks.txt" and make it a man page (diff)
downloadtgif-29182f7da4b31b11f82281a9a03edd082975dceb.tar.xz
Merge branch 'cc/hooks-doc'
* cc/hooks-doc: Documentation: rename "hooks.txt" to "githooks.txt" and make it a man page
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions