summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-14 07:36:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-14 07:36:00 -0800
commit5b57076e5863602984ad089bab882730047e0fc3 (patch)
tree8c8167dfc9200ea1df3f8cc7674846bb8d5dd2e6 /Documentation/git-difftool.txt
parentMerge branch 'jk/maint-reflog-bottom' into maint (diff)
parententry.c: remove "checkout-index" from error messages (diff)
downloadtgif-5b57076e5863602984ad089bab882730047e0fc3.tar.xz
Merge branch 'nd/maint-hide-checkout-index-from-error' into maint
* nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions