repo.or.cz
/
EMFCompare2.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[461504] Removes line-breaks in UI from attribute change values
2015-03-12
Philip Langer
[461504]
R
emoves line
-
breaks in UI from attribute cha
n
ge
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-10
Philip Lan
g
er
[458147] Th
r
ee-way
mer
g
ing
for rej
e
c
t
ing opaque
e
lement
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
Phi
l
ip Lang
e
r
[458147] Appl
y
three-way m
e
rging a
l
so for
rejec
t
ing
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
Philip Langer
[460778] Improves duplicate ID warni
n
g in IdentifierEOb
j
ectM
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-02-27
Phil
i
p
Lange
r
[4
5
7
8
3
9] A
d
ds
mode
l
update strate
g
y f
o
r
opaque element
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-02-27
P
h
ilip La
n
ger
[
4
57839] Introd
u
ces model
u
pdate
strategies for content
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-02-02
Philip
L
anger
Merge "H
a
ppy boy-scout: Fixed findbugs warning
.
"
commit
|
commitdiff
|
tree
2015-01-21
Philip Langer
[455677] [UI
T
est
s
]
Adds
U
I tes
t
s
f
or opaque element
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-01-21
Philip Langer
[456535]
A
d
ds UI t
e
st for
m
o
del-based merge from EGit
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-01-21
Phili
p
Langer
[456860] Improve handli
n
g of equivalent t
h
ree-way text
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-19
Philip Langer
[
455677]
F
i
xes insertion index of o
p
aq
u
e element body
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-19
Philip Langer
[45
1
3
6
5] Adds spec
i
fic accessors for OpaqueElementBodyChanges
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-19
Philip Langer
[451
3
65] Remo
v
e
s conflicts an
d
implicatio
n
s
of refin
i
ng
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-07
Philip L
a
nger
[451365] Ad
d
s s
p
eci
f
i
c
hand
l
ing of opaque a
c
tion, behavio
r
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-02
Phi
l
ip
L
anger
Fi
x
es minor typo in docs
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-11-11
Philip
Lange
r
[4510
4
8
] Avoids IllegalArgumentEx
c
eption for custom
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-10-27
Philip Langer
[44
6
947] Adds support for t
h
ree-way merging mu
l
t
i-line
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-10-21
Phili
p
Langer
[44812
0
] Adds Fe
a
t
u
r
eMapChangeSpec with
a
usef
u
l toStr
i
ng
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-10-14
Philip L
a
nger
[446739] Fixes
obtaining the targe
t
feature in three
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-10-10
P
hi
l
ip Langer
Adds
year of co
n
t
ributio
n
t
o
copyright header
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-09-25
Philip Langer
[443504]
Fi
x
computation
o
f igno
r
ed elements when find
i
n
g
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-08-24
Phili
p
L
a
n
g
er
[
4
4
2
439] Fixes
D
i
f
fUtil
.
getS
o
urceLis
t
f
o
r moved and
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-08-20
Philip
Langer
[441258] P
r
e
vents
IllegalArgumentException on merging
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-08-20
Philip
Langer
Adds te
s
t case e
x
posin
g
uns
u
ccessful merge reporte
d
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-08-11
Philip Langer
Fixes some
minor typ
o
s in develo
p
er and
u
s
e
r docs
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-08-05
Philip Langer
[413520] Fixe
s
IndexOutOfBou
n
dsException
on merging
.
.
.
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-07-31
Philip Langer
[440679] Avo
i
ds NPE when per
f
orming a move
Signed-off-by:
Philip Langer
<planger@eclipsesource.com>
commit
|
commitdiff
|
tree