summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.packaging
diff options
context:
space:
mode:
authorChristian Halstrick <christian.halstrick@sap.com>2014-12-12 04:54:46 -0500
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2014-12-12 04:54:46 -0500
commit80b1da1aae418fbfefd99fb88c3588d64e04680b (patch)
tree31d0bf73d82491da4bf7b87cc679f7bf5b12f4fd /org.eclipse.jgit.packaging
parent1b9130e8dbc5c5703ef5f03ade5106d83a105ba2 (diff)
parent47927ac95ee7ddc09a29f55af5eee51f139dd60a (diff)
downloadjgit-80b1da1aae418fbfefd99fb88c3588d64e04680b.tar.gz
jgit-80b1da1aae418fbfefd99fb88c3588d64e04680b.zip
Merge "CheckoutCommand: Fix checking out ours/theirs when no base stage exists" into stable-3.6
Diffstat (limited to 'org.eclipse.jgit.packaging')
0 files changed, 0 insertions, 0 deletions