summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 06:02:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 06:02:42 -0700
commitf28f04923e87f88b4692a0718cc1207b41774d43 (patch)
treea533a2b36cd85e2e9016364b600e1dd64186528f /git-mergetool--lib.sh
parentMerge branch 'em/checkout-orphan' (diff)
parentDocumentation/checkout: clarify description (diff)
downloadtgif-f28f04923e87f88b4692a0718cc1207b41774d43.tar.xz
Merge branch 'jn/checkout-doc'
* jn/checkout-doc: Documentation/checkout: clarify description Documentation/checkout: clarify description
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions