aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-21 04:02:17 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-21 04:02:17 -0700
commit1bdd46cd3a2fe1e0aeb965fb0edb493064e24495 (patch)
tree9fa257f211ffb509cb07dac585f5a80b433d795c /git-mergetool.sh
parente22d62d9151e0e51c3dc4f951fb5d88dc30482c6 (diff)
parent882749a04f828fccd795deec4d0bf10ba09ae549 (diff)
downloadgit-1bdd46cd3a2fe1e0aeb965fb0edb493064e24495.tar.gz
git-1bdd46cd3a2fe1e0aeb965fb0edb493064e24495.tar.xz
Merge branch 'tr/word-diff'
* tr/word-diff: diff: add --word-diff option that generalizes --color-words Conflicts: diff.c
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions