]> source.dussan.org Git - jgit.git/commit
Revert "Add additional FastForwardMode enums for different config contexts" 33/9633/1
authorShawn Pearce <spearce@spearce.org>
Fri, 11 Jan 2013 22:39:51 +0000 (14:39 -0800)
committerShawn Pearce <spearce@spearce.org>
Fri, 11 Jan 2013 22:39:51 +0000 (14:39 -0800)
commit50eab4aa48377d628b2715a520378adab32221e0
tree2a3db9353a02f493feede782ae3fa8fa7382b27d
parent5630686655f768a38d682df7a792d86873d7e00b
Revert "Add additional FastForwardMode enums for different config contexts"

This reverts commit c98abc9c0586c73ef7df4172644b7dd21c979e9d.

Change-Id: I1d2a0de81eb17860ee36b6d3d3c00959b880fb85
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java