]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: db82b8d) | patch
Add methods which write MERGE_HEAD and MERGE_MSG 62/1162/3
authorChristian Halstrick <christian.halstrick@sap.com>
Wed, 21 Jul 2010 15:14:54 +0000 (17:14 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 27 Jul 2010 18:48:23 +0000 (11:48 -0700)
commitf56a459966c8e5564cb23ccb3c272a0daa05a1aa
tree0bd3286e63c62de881b1a6b4aa05b6ff532bcdb7tree | snapshot
parentdb82b8d7eb646a2d31f1b4e52ab4a623743192e9commit | diff
Add methods which write MERGE_HEAD and MERGE_MSG

Add methods to the Repository class which write into MERGE_HEAD
and MERGE_MSG files. Since we have the read methods in the same
class this seems to be the right place.

Change-Id: I5dd65306ceb06e008fcc71b37ca3a649632ba462
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/MergeHeadMsgTest.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit