diff options
author | Tomasz Zarna <tomasz.zarna@tasktop.com> | 2012-11-18 22:35:53 +0100 |
---|---|---|
committer | Chris Aniszczyk <zx@twitter.com> | 2012-11-18 18:32:37 -0600 |
commit | 20c3b6b8a0ba4f3d9f5666dd48b132839ab7e5bf (patch) | |
tree | a5900156beb06f140a3cf9c5823aa3c03682f133 /org.eclipse.jgit/resources/org/eclipse/jgit | |
parent | 6a94f027b6302f1630ccbad8fd4dc5d7f54645d4 (diff) | |
download | jgit-20c3b6b8a0ba4f3d9f5666dd48b132839ab7e5bf.tar.gz jgit-20c3b6b8a0ba4f3d9f5666dd48b132839ab7e5bf.zip |
Add config constant for "mergeoptions"
Bug: 336933
Change-Id: Idcc0fbc8a8143dd665e80e4d6f4a4adaeae287db
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse/jgit')
0 files changed, 0 insertions, 0 deletions