summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-xdiff-interface.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-11-26 11:11:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-26 11:11:18 -0800
commit42fc11c1103a88c49233f04dc0c2f5659b3973fe (patch)
treee376a924ff3128ec31582fd988f166cdbfdb9413 /Documentation/technical/api-xdiff-interface.txt
parentMerge branch 'for-junio' of git://source.winehq.org/~julliard/git/git (diff)
parentconfig.txt: alphabetize configuration sections (diff)
downloadtgif-42fc11c1103a88c49233f04dc0c2f5659b3973fe.tar.xz
Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc
* mm/maint-sort-config-doc: config.txt: alphabetize configuration sections Conflicts: Documentation/config.txt
Diffstat (limited to 'Documentation/technical/api-xdiff-interface.txt')
0 files changed, 0 insertions, 0 deletions