summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-25 23:12:21 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-25 23:12:21 -0700
commite9b5b75ca87f45292de8ecde5d4d0512ac9542cd (patch)
treebe4cc0707c97c8bbd2dc4699f646f886fe2739a9 /Documentation/merge-options.txt
parentMakefile: remove and create libgit.a from scratch. (diff)
parentLibified diff-index: backward compatibility fix. (diff)
downloadtgif-e9b5b75ca87f45292de8ecde5d4d0512ac9542cd.tar.xz
Merge branch 'jc/diff'
* jc/diff: Libified diff-index: backward compatibility fix. Libify diff-index. Libify diff-files.
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions