Dmitry Fink 876953ea4d Add experimental support for automatic conflict handling ...

Use new content merge functionality in JGit for automatic
resolution of conflicts within a file.

Change-Id: Ifae8a94709fb60f13e4c79fb6bb77a214ef5f0b7
Signed-off-by: Shawn O. Pearce <sop@google.com>

2010-10-14 21:37:22 -07:00

..

.settings

Implement full query operators

2010-07-17 20:24:51 -07:00

src

Add experimental support for automatic conflict handling

2010-10-14 21:37:22 -07:00

.gitignore

Rewrite our build as modular maven components

2009-11-11 16:54:06 -08:00

pom.xml

Fix all of our pom.xml versions to be 2.1-SNAPSHOT

2010-08-12 16:24:43 -07:00