]> source.dussan.org Git - jgit.git/commit
Merge "CheckoutCommand: Fix checking out ours/theirs when no base stage exists" into...
authorChristian Halstrick <christian.halstrick@sap.com>
Fri, 12 Dec 2014 09:54:46 +0000 (04:54 -0500)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Fri, 12 Dec 2014 09:54:46 +0000 (04:54 -0500)
commit80b1da1aae418fbfefd99fb88c3588d64e04680b
tree31d0bf73d82491da4bf7b87cc679f7bf5b12f4fd
parent1b9130e8dbc5c5703ef5f03ade5106d83a105ba2
parent47927ac95ee7ddc09a29f55af5eee51f139dd60a
Merge "CheckoutCommand: Fix checking out ours/theirs when no base stage exists" into stable-3.6