Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 400:deb64baaa412
Merge fixes for issue 25 from smartgit3 branch
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Sat, 25 Feb 2012 19:35:16 +0100 | 
| parents | 2fadf8695f8a | 
| children | ee8264d80747 | 
