diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-15 00:39:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-15 00:39:19 +0200 |
| commit | 5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20 (patch) | |
| tree | fc993f674db014236b94f3c6e147b1ac5b838699 /gitMergeCommon.py | |
| parent | Merge branch 'sp/lazy-mkdir' (diff) | |
| parent | builtin-prune.c: forgot TYPE => OBJ changes. (diff) | |
| download | git-5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20.tar.xz git-5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20.zip | |
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 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions