Mercurial > jhg
comparison src/org/tmatesoft/hg/repo/HgMergeState.java @ 643:a8ce405da1f5
v1.2 line of dev: update versions, use patch merge code by default
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 19 Jun 2013 16:03:11 +0200 |
| parents | 6526d8adbc0f |
| children | b4242b7e7dfe |
comparison
equal
deleted
inserted
replaced
| 642:9ef1fab9f5e3 | 643:a8ce405da1f5 |
|---|