diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-01-13 11:24:45 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-01-26 10:07:59 +0300 |
| commit | 232df1394c114a6ef2d844d572e0493bf4a6e60d (patch) | |
| tree | 3499ad21b0c579c4d926f41216270df16a1fd554 /internal/git2go | |
| parent | f7e7478f35e8773b435e862700af99f9f2db1607 (diff) | |
conflicts: Expose helper to merge a conflicting index entry
In order to compute the list of conflicts, we have a function which
takes an `IndexConflict` as input and computes a merged file which
contains the conflicts as part of its merged contents, including
conflict markers. While this function is currently only used in a single
location, we're about to extend the UserMergeToRef RPC to also
optionally commit conflict markers, where this function will be useful.
Let's expose it up front in order to make it available outside of its
current module.
Diffstat (limited to 'internal/git2go')
0 files changed, 0 insertions, 0 deletions