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
Merge "Correct the order of processing post processors."
2014-06-11
Mikael Barbero
Mer
g
e "Correct th
e
ord
e
r of proc
e
s
s
ing post pr
o
cessors
.
"
commit
|
commitdiff
|
tree
2014-06-02
M
i
kael B
a
rbe
r
o
Merg
e
"[434828] Test Merge Conflict Diff
W
i
th Conflic
t
ing
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mikael
Barbero
Merge "[43482
8
] Test Merge Conflict Diff
W
ith
Conflicting
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mikael Bar
b
ero
M
erge "[434822] Conflict
b
et
w
e
en move and del
e
t
e
"
commit
|
commitdiff
|
tree
2014-05-27
Mi
k
ael Barbero
Merge "[
4
32033] Do not reset Grou
p
and filt
e
r af
t
er
.
.
.
commit
|
commitdiff
|
tree
2014-05-26
Mikael B
a
rbe
r
o
Merge "[435617
]
Fix Struc
t
ure
M
erg
e
Viewer content
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
M
i
k
a
el Barbero
Merge "[435
3
65] Cas
c
a
din
g
Fil
t
er s
h
o
u
ldn't fi
l
t
er out
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Mikael Barbero
Merge "[4
3
1882]
Fix IllegalStateException i
n
c
a
se o
f
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
M
ikae
l
Ba
r
be
r
o
Merge "Limit
scope of
res
o
u
r
c
e
delta reactions in the
.
.
.
commit
|
commitdiff
|
tree
2014-05-21
Mikael
B
arbero
Merge
"
[4
3
5376]
Conflicted subdiffs
s
hou
l
dn't
b
e mer
g
ed
.
.
.
commit
|
commitdiff
|
tree
2014-05-21
M
ikael Barber
o
Merge "[4
3
4827
]
W
rong overl
a
y
i
con after merge"
commit
|
commitdiff
|
tree
2014-05-20
Mikae
l
B
a
r
b
e
r
o
Mer
g
e
"t
r
y and handle git local revisions du
r
ing com
p
arison"
commit
|
commitdiff
|
tree
2014-05-20
M
i
kael Barbero
Merge ""O
K
" status should s
t
ill display the co
m
parison"
commit
|
commitdiff
|
tree
2014-05-14
Mikael Barb
e
r
o
M
e
rge
"
e
n
able
pack200 an
d
in
c
lude p
a
cked
a
rtefacts"
commit
|
commitdiff
|
tree
2014-05-13
M
i
k
a
el Barbe
r
o
Merge
"[434
2
0
0
] Ac
c
ept/Reject d
i
fference f
a
ils in some
.
.
.
commit
|
commitdiff
|
tree
2014-05-06
Mikael Barbe
r
o
Me
r
ge "[434165] Mark consequ
e
nces
a
s
merg
e
"
commit
|
commitdiff
|
tree
2014-05-06
M
ikael Bar
b
ero
Merge
"reduce syn
c
hroniz
a
t
i
on ov
e
rhead of mo
d
el
re
s
olvin
g
"
commit
|
commitdiff
|
tree
2014-05-05
Mi
k
ae
l
Barbe
r
o
Merge "Add
pse
u
do
co
n
flict diffs to th
e
req
u
i
red consequence
.
.
.
commit
|
commitdiff
|
tree
2014-04-17
Mikael Bar
b
ero
Merge "sma
l
l performance tweak : a
v
oi
d
mul
t
i
ple eResource
.
.
.
commit
|
commitdiff
|
tree
2014-03-26
Mika
e
l Barbero
Merge "[430372] Refactor filter
s
.
"
commit
|
commitdiff
|
tree
2014-03-26
Mikael Barbero
Merge "[428
9
16] Rejecting addition wi
t
h local hi
s
tory
.
.
.
commit
|
commitdiff
|
tree
2014-03-25
M
i
kael Barbero
Merge "Correc
t
or
d
er on pos
t
proc
e
ssors
.
"
commit
|
commitdiff
|
tree
2014-03-25
Mikael Barbero
M
e
r
ge "[406439
]
EMF Compare does not s
u
pport li
s
t
w
ith
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Mikael Barbe
r
o
M
e
rge "Pre
v
ent c
h
anging grou
p
twice for
only o
n
e sel
e
ction
.
"
commit
|
commitdiff
|
tree
2014-03-10
Mikael
Ba
r
bero
Merg
e
"
Update RCP
U
I extension points
referenc
e
s in
.
.
.
commit
|
commitdiff
|
tree
2014-02-03
Mikae
l
Barbero
Merge changes Icb07f3
7
c,I85
5
7bf7e
commit
|
commitdiff
|
tree
2014-01-29
Mikael Barbero
M
e
rge "Change BREEs
t
o Jav
a
1
.
6 and activate API error
.
.
.
commit
|
commitdiff
|
tree
2014-01-07
Mikae
l
Barber
o
Merge "
F
ix co
n
dition bug in Proximit
y
EObjectM
a
tcher
.
.
.
commit
|
commitdiff
|
tree
2013-10-01
Mik
a
el
Ba
r
bero
Mer
g
e "Sharing Lun
a
ta
r
get platform (M1) an
d
target
.
.
.
commit
|
commitdiff
|
tree
2013-07-23
Mikael Barbero
M
e
rge "
N
e
w
ext
e
nsi
o
n
p
oint to exten
d
group
pro
v
iders"
commit
|
commitdiff
|
tree
2013-07-16
Mika
e
l
B
arbero
M
e
rge "[412748
]
EMF
Compare
P
roperty
V
iew"
commit
|
commitdiff
|
tree
2013-07-16
Mikael
B
a
r
b
e
r
o
Merge
"Add RC
P
UI tests
.
"
commit
|
commitdiff
|
tree
2013-06-19
Mikael
Barbero
Merge "Cache the d
e
p
endency g
r
aph
as Team
c
a
lls it
.
.
.
commit
|
commitdiff
|
tree
2013-01-29
Mi
k
ael Barbe
r
o
Merge "[398
3
58] E
x
tensi
o
n
point for fi
l
ters and groups"
commit
|
commitdiff
|
tree