diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-11 17:25:09 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-05-11 11:50:18 -0700 |
| commit | 521331cc9f71515e214d0821a35cafd5c03eaad3 (patch) | |
| tree | 9d2e41d6b835cf087ef5a2d4c70c7c87276b5f22 /resolve-undo.c | |
| parent | report_refname_conflict(): inline function (diff) | |
| download | tgif-521331cc9f71515e214d0821a35cafd5c03eaad3.tar.xz | |
struct nonmatching_ref_data: store a refname instead of a ref_entry
Now that we don't need a ref_entry to pass to
report_refname_conflict(), it is sufficient to store the refname of
the conflicting reference.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions