[josm-dev] How does merging exactly work ?

[colliar]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

I also wonder that I get a lot more conflicts merging two files with tested than
I do get with latest right now.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEAREIAAYFAkurKlwACgkQalWTFLzqsCsrmACdFxsJkYptVpQRNzR9s9kC545m
udgAoIWGtv+WfP3RItVJp4zsDw4t8/y2
=zMRp
-----END PGP SIGNATURE-----