summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 22:39:27 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 22:39:27 -0700
commitde809dbbce497e0d107562615c1d85ff35b4e0c5 (patch)
treef435f47dab3465a47fbd2114cf006e0e869f31a9 /git-resolve-script
parent57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c (diff)
downloadgit-de809dbbce497e0d107562615c1d85ff35b4e0c5.tar.gz
Fix up previous commit
Add '-R' flag to diff-tree, and change the test subdirectory shell files to be executable (something that Junio couldn't get me to do through the pure patch with my current patch handling infrastructure).
Diffstat (limited to 'git-resolve-script')
0 files changed, 0 insertions, 0 deletions