summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:15:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:15:34 -0700
commitd39753c23824f0c384a7932f3772f0ddc25010f7 (patch)
treefc96944ad12770856a766c59d010f5c755717020 /git-merge-resolve.sh
parentMerge branch 'va/p4-branch-import' (diff)
parentMark http-fetch without -a as deprecated (diff)
downloadtgif-d39753c23824f0c384a7932f3772f0ddc25010f7.tar.xz
Merge branch 'bw/doc-repo-layout'
* bw/doc-repo-layout: Mark http-fetch without -a as deprecated Documentation: Grammar correction, wording fixes and cleanup
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions