summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-26 16:09:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-26 16:09:03 -0700
commitdf9701e28c5bae14d53585569e0bad561d36500e (patch)
tree52af1b7996634d388730bb04eff46ea342a1a83f /t/t6023-merge-file.sh
parentMerge branch 'maint-1.7.5' into maint-1.7.6 (diff)
parentgit-read-tree.txt: correct sparse-checkout and skip-worktree description (diff)
downloadtgif-df9701e28c5bae14d53585569e0bad561d36500e.tar.xz
Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6
* mg/maint-doc-sparse-checkout: git-read-tree.txt: correct sparse-checkout and skip-worktree description git-read-tree.txt: language and typography fixes unpack-trees: print "Aborting" to stderr
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions