]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2396744) | patch
Do not categorize merge failures as 'abnormal' 48/2948/1
authorPhilipp Thun <philipp.thun@sap.com>
Mon, 28 Mar 2011 14:01:44 +0000 (16:01 +0200)
committerPhilipp Thun <philipp.thun@sap.com>
Mon, 28 Mar 2011 14:01:44 +0000 (16:01 +0200)
commit761b9285f07bf209ea3b282fe9079cbbf097fd79
tree6d6663f38c2a075e918149084be05bd4b5880ce1tree | snapshot
parent23967441fc5b72996f5f29e197d52e763a14cb32commit | diff
Do not categorize merge failures as 'abnormal'

This change contains a simple renaming. Instead of using the
expression 'abnormal failure', we just treat this kind of situation
as 'failure'. This is specific enough as conflicts are already handled
separately.

Change-Id: I535acdc7d022543ed0f5ac6151b09a6985f4ef38
Signed-off-by: Philipp Thun <philipp.thun@sap.com>
org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickResult.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit