Sign in
android
/
platform
/
tools
/
idea
/
9b5d02ac8c92b1e71523cc15cb3d168d57fbd898
/
.
/
plugins
/
git4idea
/
testData
/
config
/
branch
/
b4_merge_and_rebase
/
b4_desc.txt
blob: a2029c60ff0ceae243206a90af08dafbc0af7938 [
file
] [
log
] [
blame
]
b4 Branch with both merge and rebase
Then only merge is taken into consideration.
