diff options
| author | Bernard Leach <leachbj@bouncycastle.org> | 2011-05-13 15:59:57 +1000 |
|---|---|---|
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-05-19 09:22:25 -0500 |
| commit | 5ec4977bb514ec8eb01dd22c3e908fe3fe6da83f (patch) | |
| tree | 1fe106eb4ec4f2742faa7822a265bc71e4742907 /org.eclipse.jgit.ant/src | |
| parent | 37fe0988b26b7893888a073a33ccf0865723ca8b (diff) | |
| download | jgit-5ec4977bb514ec8eb01dd22c3e908fe3fe6da83f.tar.gz jgit-5ec4977bb514ec8eb01dd22c3e908fe3fe6da83f.zip | |
Create a MergeResult for deleted/modified files
Change Ia2ab4f8dc95020f2914ff01c2bf3b1bc62a9d45d added merge
support for when OURS or THEIRS was simultaneously deleted
and modified. That changeset however did not add create an
entry in the conflicts table so clients would see a CONFLICTING
result but getConflicts() would return null.
This change creates a MergeResult for the conflicting file.
Bug: 345684
Change-Id: I52acb81c1729b49c9fb3e7a477c6448d8e55c317
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.ant/src')
0 files changed, 0 insertions, 0 deletions