summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-base.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-07-14 15:39:19 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-14 15:39:19 -0700
commit5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20 (patch)
treefc993f674db014236b94f3c6e147b1ac5b838699 /Documentation/git-merge-base.txt
parentMerge branch 'sp/lazy-mkdir' (diff)
parentbuiltin-prune.c: forgot TYPE => OBJ changes. (diff)
downloadtgif-5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20.tar.xz
Merge branch 'lt/unitype'
* lt/unitype: builtin-prune.c: forgot TYPE => OBJ changes. Remove TYPE_* constant macros and use object_type enums consistently.
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions