Merge "Prepare EGit for the new State MERGING_RESOLVED"
commit6eb99d5e5763052400695728b60d274345653e20
authorChris Aniszczyk <caniszczyk@gmail.com>
Sun, 9 May 2010 16:17:46 +0000 (9 12:17 -0400)
committerCode Review <codereview-daemon@eclipse.org>
Sun, 9 May 2010 16:17:46 +0000 (9 12:17 -0400)
tree874876977990c60d7184e5ef88692cc03a65d545
parent92136a31eca6ef4dbbe330dabefbc696b2104045
parent29cfc78d5011ec409993d539cec0ef890f227381
Merge "Prepare EGit for the new State MERGING_RESOLVED"