diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 13:56:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 14:40:03 -0700 |
| commit | f2633ebd766b7f5817ae0ec69060170bb9b1501f (patch) | |
| tree | c3139aeef3df05f44d0b1039c5e66e35f25ddf27 /builtin | |
| parent | 4f4a6cb9882516d75f345772c9bf00b891753f10 (diff) | |
| download | git-f2633ebd766b7f5817ae0ec69060170bb9b1501f.tar.gz git-f2633ebd766b7f5817ae0ec69060170bb9b1501f.tar.xz | |
apply: allow rerere() to work on --3way results
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index dc52c9475..cd68862aa 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -18,6 +18,7 @@ #include "parse-options.h" #include "xdiff-interface.h" #include "ll-merge.h" +#include "rerere.h" /* * --check turns on checking that the working tree matches the @@ -4026,6 +4027,8 @@ static int write_out_results(struct patch *list) for_each_string_list_item(item, &cpath) fprintf(stderr, "U %s\n", item->string); string_list_clear(&cpath, 0); + + rerere(0); } return errs; |