conflict          944 maint/gnulib/lib/git-merge-changelog.c conflict_write (FILE *fp, struct conflict *c)
conflict         1283 maint/gnulib/lib/git-merge-changelog.c                       struct conflict *c = XMALLOC (struct conflict);
conflict         1318 maint/gnulib/lib/git-merge-changelog.c                         struct conflict *c = XMALLOC (struct conflict);
conflict         1409 maint/gnulib/lib/git-merge-changelog.c                                     struct conflict *c = XMALLOC (struct conflict);
conflict         1488 maint/gnulib/lib/git-merge-changelog.c                                     struct conflict *c;
conflict         1491 maint/gnulib/lib/git-merge-changelog.c                                     c = XMALLOC (struct conflict);
conflict         1553 maint/gnulib/lib/git-merge-changelog.c                                         struct conflict *c;
conflict         1556 maint/gnulib/lib/git-merge-changelog.c                                         c = XMALLOC (struct conflict);
conflict         1626 maint/gnulib/lib/git-merge-changelog.c                     struct conflict *c = XMALLOC (struct conflict);
conflict         1660 maint/gnulib/lib/git-merge-changelog.c           conflict_write (fp, (struct conflict *) gl_list_get_at (result_conflicts, i));