| commit | ee7102ae080ab23043392ddeee8c307e12e52708 | |
| author | Chris Aniszczyk <caniszczyk@gmail.com> | |
| Mon, 24 May 2010 15:09:21 +0000 (24 10:09 -0500) | ||
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | |
| Mon, 24 May 2010 15:09:21 +0000 (24 10:09 -0500) | ||
| tree | a0a58f68a93bf878b7aa9df892ebeb89ef7e3540 | treesnapshot (tar.gz zip) |
| parent | 567f2c0ef7e710482fe8d3e2bd2bd0079c1d6132 | commitdiff |
Handle InvalidMergeHeadsException
Change-Id: Idfbaca9dd585dd837478c39ffd385c53980bf9f1
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Change-Id: Idfbaca9dd585dd837478c39ffd385c53980bf9f1
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
| org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergeOperation.java | diffblobblamehistory |