summaryrefslogtreecommitdiff
path: root/t/t6438-submodule-directory-file-conflicts.sh
diff options
context:
space:
mode:
authorLibravatar Pratyush Yadav <me@yadavpratyush.com>2020-09-22 15:21:19 +0530
committerLibravatar Pratyush Yadav <me@yadavpratyush.com>2020-09-22 15:21:19 +0530
commit95bfc6cdb697b971ffd7766f353d9bcf7bad9f6f (patch)
treec8d7948580b4023a150405fc4495a7f5056bbca9 /t/t6438-submodule-directory-file-conflicts.sh
parentMerge branch 'mt/open-worktree' (diff)
parentgit-gui: fix mixed tabs and spaces; prefer tabs (diff)
downloadtgif-95bfc6cdb697b971ffd7766f353d9bcf7bad9f6f.tar.xz
Merge branch 'st/spaces-tabs-cleanup' into master
Clean up some whitespace. * st/spaces-tabs-cleanup: git-gui: fix mixed tabs and spaces; prefer tabs
Diffstat (limited to 't/t6438-submodule-directory-file-conflicts.sh')
0 files changed, 0 insertions, 0 deletions