Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Lay2010-08-27 15:15:17 +0000
committerCode Review2010-08-27 15:15:17 +0000
commit2131c14b02cf51a5c007c9cffe80db542ddbc201 (patch)
treefc6efa5870bb5f7ff01ef7fcc497564d215a1080 /org.eclipse.egit.core.test
parenta97cc8d2ffcb48bdff037daa60a43a14f6e8ba8d (diff)
parent8a77b0e19796c460a79308020cf2f3ec16cba184 (diff)
downloadegit-2131c14b02cf51a5c007c9cffe80db542ddbc201.tar.gz
egit-2131c14b02cf51a5c007c9cffe80db542ddbc201.tar.xz
egit-2131c14b02cf51a5c007c9cffe80db542ddbc201.zip
Merge "Don't display merge commit as conflicting"
Diffstat (limited to 'org.eclipse.egit.core.test')
0 files changed, 0 insertions, 0 deletions

Back to the top