diff options
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/diff-lib.c b/diff-lib.c index 5848e4f9ca..8fde93d7ca 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -2,7 +2,6 @@ * Copyright (C) 2005 Junio C Hamano */ #include "git-compat-util.h" -#include "quote.h" #include "commit.h" #include "diff.h" #include "diffcore.h" @@ -571,8 +570,6 @@ void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb) struct object *obj = revs->pending.objects[i].item; if (obj->flags) die(_("--merge-base does not work with ranges")); - if (obj->type != OBJ_COMMIT) - die(_("--merge-base only works with commits")); } /* |