| commit | a68638b83624157466a114a3597fa3ba866f8d97 | |
| author | Mathieu Cartaud <mathieu.cartaud@obeo.fr> | |
| Fri, 4 Sep 2015 08:17:20 +0000 (4 10:17 +0200) | ||
| committer | Mathieu Cartaud <mathieu.cartaud@obeo.fr> | |
| Tue, 15 Sep 2015 15:24:49 +0000 (15 17:24 +0200) | ||
| tree | b335e864b57a368d529f029e8d17d87b163ba5f9 | treesnapshot (tar.gz zip) |
| parent | f77623dd2afd86b01f64b85b25a12e04c2f100e5 | commitdiff |
Fix label issues when using the MergeTool on merge conflicts
The commit id from EGit in this case is "Index". This case was not handled,
now the information "Index" is displayed.
Change-Id: I84ad6431a75a656f1fbddc539b7d0a58ff893ef2
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
The commit id from EGit in this case is "Index". This case was not handled,
now the information "Index" is displayed.
Change-Id: I84ad6431a75a656f1fbddc539b7d0a58ff893ef2
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>