diff options
author | Matthias Sohn | 2010-12-08 11:58:50 +0000 |
---|---|---|
committer | Code Review | 2010-12-08 11:58:50 +0000 |
commit | 6cc050fb8ae864e23ac42fd06b8128566c2dd8ab (patch) | |
tree | dd27f85802a99168ba8c361b6c89f1fdf5c90f37 /org.eclipse.egit.core.test | |
parent | 2d56ab99edc18a65e37be3d100ca53047070f81f (diff) | |
parent | bfc439fe900dd036aa97a36b9a0dea18b5e9df20 (diff) | |
download | egit-6cc050fb8ae864e23ac42fd06b8128566c2dd8ab.tar.gz egit-6cc050fb8ae864e23ac42fd06b8128566c2dd8ab.tar.xz egit-6cc050fb8ae864e23ac42fd06b8128566c2dd8ab.zip |
Merge "Rebase Interoperability: do not auto-abort upon conflict"
Diffstat (limited to 'org.eclipse.egit.core.test')
0 files changed, 0 insertions, 0 deletions