aboutsummaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-04 15:02:27 -0800
committerJunio C Hamano <gitster@pobox.com>2011-03-04 15:02:27 -0800
commit08fd8710e277eed73a21c6c5483c57bfeb14e8a7 (patch)
tree5d7341cdbf0f7076724615bde742a70b0ad08227 /contrib/fast-import/git-p4
parent5cb3c9b7dff15f762d63df0b6f2d6b4bf82565e9 (diff)
parent853c0ffe42fef0bd1abd5cc69d5e93fdd5a708aa (diff)
downloadgit-08fd8710e277eed73a21c6c5483c57bfeb14e8a7.tar.gz
git-08fd8710e277eed73a21c6c5483c57bfeb14e8a7.tar.xz
Merge branch 'mg/maint-difftool-vim-readonly'
* mg/maint-difftool-vim-readonly: mergetool-lib: call vim in readonly mode for diffs
Diffstat (limited to 'contrib/fast-import/git-p4')
0 files changed, 0 insertions, 0 deletions