diff options
Diffstat (limited to 'src/diff_tform.c')
| -rw-r--r-- | src/diff_tform.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/diff_tform.c b/src/diff_tform.c index 03dd9c9f7..041592fbf 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -65,6 +65,12 @@ static git_diff_delta *diff_delta__merge_like_cgit( * f3 = b->new_file */ + /* If one of the diffs is a conflict, just dup it */ + if (b->status == GIT_DELTA_CONFLICTED) + return diff_delta__dup(b, pool); + if (a->status == GIT_DELTA_CONFLICTED) + return diff_delta__dup(a, pool); + /* if f2 == f3 or f2 is deleted, then just dup the 'a' diff */ if (b->status == GIT_DELTA_UNMODIFIED || a->status == GIT_DELTA_DELETED) return diff_delta__dup(a, pool); @@ -111,6 +117,11 @@ static git_diff_delta *diff_delta__merge_like_cgit_reversed( /* reversed version of above logic */ + if (a->status == GIT_DELTA_CONFLICTED) + return diff_delta__dup(a, pool); + if (b->status == GIT_DELTA_CONFLICTED) + return diff_delta__dup(b, pool); + if (a->status == GIT_DELTA_UNMODIFIED) return diff_delta__dup(b, pool); |