Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 457:d78cb5ca3053
Get rid of ambiguity in method name
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Mon, 18 Jun 2012 17:06:42 +0200 |
parents | 12f668401613 |
children | b3c16d1aede0 |