Mercurial > jhg

log src/org/tmatesoft/hg/repo/HgMergeState.java @ 712:a864fb309e4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -10 -7 tip
age author description
Tue, 20 Aug 2013 18:41:34 +0200 Artem Tikhomirov Merge: tests for resolver and complex scenario. Enable commit for merged revisions. Reuse file revisions if nothing changed
Fri, 16 Aug 2013 19:22:59 +0200 Artem Tikhomirov Merge: support 'unresolved' resolution with MergeStateBuilder
Thu, 15 Aug 2013 18:43:50 +0200 Artem Tikhomirov Merge command: implement conflict resolution alternatives
Wed, 22 May 2013 15:52:31 +0200 Artem Tikhomirov Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
Thu, 16 Aug 2012 17:08:34 +0200 Artem Tikhomirov Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
Thu, 29 Mar 2012 20:54:04 +0200 Artem Tikhomirov FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
Fri, 23 Mar 2012 22:51:18 +0100 Artem Tikhomirov Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
less more | (0) -10 -7 tip