summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-10 15:56:18 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-10 15:56:18 -0700
commit7ddd582402aa926d5ec33d914ccc8bfaf1b15c06 (patch)
tree4c17578024416e93f4d429608d7522c1b226778c /git-mergetool.sh
parent034a8a0df392fa809a506d0da65b9245db939d8f (diff)
parentf01cae918feb564da8c7a286b32c7c917599acdd (diff)
downloadgit-7ddd582402aa926d5ec33d914ccc8bfaf1b15c06.tar.gz
Merge branch 'jc/maint-diffstat-numstat-context'
* jc/maint-diffstat-numstat-context: diff: teach --stat/--numstat to honor -U$num
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions