Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jgit
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Service Desk

Snippets Groups Projects

541ad72a

Commit 541ad72a authored 14 years ago by Robin Rosenberg Committed by Code Review 14 years ago

Downloads
- Plain Diff

Merge "Added MERGING_RESOLVED repository state"

parents 0df679ae b9ab040b

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheBasicTest.java 20 additions, 0 deletions

...test/tst/org/eclipse/jgit/dircache/DirCacheBasicTest.java
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java 16 additions, 0 deletions

org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java 16 additions, 1 deletion

org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java 11 additions, 0 deletions

...clipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java

with 63 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment