aboutsummaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-26 00:27:30 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-26 00:27:30 -0700
commitb71fdc590d660f81e8e2ebfdab989feb60e86dde (patch)
treea73038255ad7ab3d43dfed19e47d3d410382bb86 /userdiff.h
parentb2aa958dc29eb836a831138f6d84ad7cfadf4355 (diff)
parent4e218f54b3de6aa8ef7d15020c4507031a519f7d (diff)
downloadgit-b71fdc590d660f81e8e2ebfdab989feb60e86dde.tar.gz
git-b71fdc590d660f81e8e2ebfdab989feb60e86dde.tar.xz
Merge branch 'js/maint-diff-temp-smudge'
* js/maint-diff-temp-smudge: Smudge the files fed to external diff and textconv
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions