Mercurial > hg4j
comparison src/org/tmatesoft/hg/repo/HgMergeState.java @ 572:becd2a1310a2
Report file object in case of error to be helpful as much as possible
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Fri, 12 Apr 2013 18:30:55 +0200 |
| parents | b3c16d1aede0 |
| children | 6526d8adbc0f |
comparison
equal
deleted
inserted
replaced
| 571:e4ee4bf4c7d0 | 572:becd2a1310a2 |
|---|