SynoCommunity/spksrc — comment on commit 5464d8248b2930b5e328235d6938f9351e2cd848
File:  line 0
By Diaoul:

Nothing weird, seems ok. Were you asked to merge anything when pulling ? Do you have multiple remotes ?
Look, this merge has 2 parents : 07019fc303 + 72c5fc90cf which is weird because if you pulled and if it fast-forwarded, no reason to have a "merge" anywhere.
Plus, you don't have anything to merge as you edited both different files.

I'll try to add some stuff on my outdated working copy and push it to see if I have the same behaviour. That's a bit ugly in the history :/