From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 25 May 2022 04:26:23 +0000 (+0200)
Subject: Improve merging
X-Git-Tag: v2.3.5~47
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=1795c9fbcacccf8289a573a787067f831bd7d1ee;hp=1795c9fbcacccf8289a573a787067f831bd7d1ee;p=gpl%2Fargeo-slc.git

Improve merging
---