summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-19 10:39:06 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-19 10:39:06 -0700
commit439b55b37c215da67aedd4bce8c6d471de4246e1 (patch)
treeee8c80acb321a887b7ed6acb99642cd49833a6bd /Documentation/git-merge-index.txt
parent65ed8684c4ef5a36f2d172f1cb8b88d993c0e4ec (diff)
parent5e62cc14c36fa1d10a057ebe6fd2bba504422573 (diff)
downloadgit-439b55b37c215da67aedd4bce8c6d471de4246e1.tar.gz
Merge branch 'rr/column-doc' into maint
* rr/column-doc: column doc: rewrite documentation for column.ui
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions