summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-11-12 12:13:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-11-12 12:13:12 -0800
commit7fa1365c54c28b3cd9375539f381b54061a1880d (patch)
treea491c1b8644aac729fff4a42a2dfdd3750b81802 /mergetools/diffmerge
parentMerge branch 'rs/clean-menu-item-defn' into maint (diff)
parentgitignore.txt: fix spelling of "backslash" (diff)
downloadtgif-7fa1365c54c28b3cd9375539f381b54061a1880d.tar.xz
Merge branch 'nd/gitignore-trailing-whitespace' into maint
* nd/gitignore-trailing-whitespace: gitignore.txt: fix spelling of "backslash"
Diffstat (limited to 'mergetools/diffmerge')
0 files changed, 0 insertions, 0 deletions