aboutsummaryrefslogtreecommitdiffhomepage
path: root/stm/vcs.ml
diff options
context:
space:
mode:
authorGravatar Maxime Dénès <mail@maximedenes.fr>2017-06-23 17:13:07 +0200
committerGravatar Maxime Dénès <mail@maximedenes.fr>2017-06-23 17:13:07 +0200
commit7cc335bd4cc568bdf892da60ebd16e6acfe019cd (patch)
tree88f80833a60ecdd5ec65857ce77c11499f930912 /stm/vcs.ml
parent5d631016870a351d27ce9c6cbd63f35836b4bcd6 (diff)
parentfb09983542295dc31122fbad5e01799c1f48e498 (diff)
Merge PR#820: [ide] Correct more merging errors.
Diffstat (limited to 'stm/vcs.ml')
0 files changed, 0 insertions, 0 deletions