You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Stefan Lay 5b0e73b849 Add a merge command to the jgit API 14 years ago
..
CheckoutConflictException.java Add a merge command to the jgit API 14 years ago
CommitCommand.java Added merge support to CommitCommand 14 years ago
ConcurrentRefUpdateException.java Externalize strings from JGit 14 years ago
Git.java Add a merge command to the jgit API 14 years ago
GitAPIException.java Add builder-style API to jgit and Commit & Log cmd 14 years ago
GitCommand.java Externalize strings from JGit 14 years ago
InvalidMergeHeadsException.java Add a merge command to the jgit API 14 years ago
JGitInternalException.java Add builder-style API to jgit and Commit & Log cmd 14 years ago
LogCommand.java Externalize strings from JGit 14 years ago
MergeCommand.java Add a merge command to the jgit API 14 years ago
MergeResult.java Add a merge command to the jgit API 14 years ago
NoHeadException.java Add builder-style API to jgit and Commit & Log cmd 14 years ago
NoMessageException.java Add builder-style API to jgit and Commit & Log cmd 14 years ago
WrongRepositoryStateException.java Added merge support to CommitCommand 14 years ago