diff options
Diffstat (limited to 'merge-ort-wrappers.c')
| -rw-r--r-- | merge-ort-wrappers.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/merge-ort-wrappers.c b/merge-ort-wrappers.c index ad04106..4acedf3 100644 --- a/merge-ort-wrappers.c +++ b/merge-ort-wrappers.c @@ -1,6 +1,10 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "gettext.h" +#include "hash.h" #include "merge-ort.h" #include "merge-ort-wrappers.h" +#include "read-cache-ll.h" +#include "tree.h" #include "commit.h" @@ -10,8 +14,8 @@ static int unclean(struct merge_options *opt, struct tree *head) struct strbuf sb = STRBUF_INIT; if (head && repo_index_has_changes(opt->repo, head, &sb)) { - fprintf(stderr, _("Your local changes to the following files would be overwritten by merge:\n %s"), - sb.buf); + error(_("Your local changes to the following files would be overwritten by merge:\n %s"), + sb.buf); strbuf_release(&sb); return -1; } |