Anonymous

Trying really trivial in-index merge...
VERSION: needs merge
po/LINGUAS: needs merge
po/ca.po: needs merge
po/de.po: needs merge
po/el.po: needs merge
po/fr.po: needs merge
po/gl.po: needs merge
po/it.po: needs merge
po/nb.po: needs merge
po/pl.po: needs merge
po/pt.po: needs merge
po/sv.po: needs merge
po/tr.po: needs merge
src/group/group-internal.h: needs merge
src/group/group.c: needs merge
src/group/init.c: needs merge
src/group/selection.c: needs merge
src/group/tab.c: needs merge
src/reflex/reflex.c: needs merge
fatal: you need to resolve your current index first
Nope.
Merging HEAD with 72af3c8620b783928a8d04a6342fff3d1fd7e8fc
Merging:
95c648a pt translation update
72af3c8 Fix damaging of tab bars without slots.
found 1 common ancestor(s):
9eff040 * Correctly handle desktop opacity when there's no image
fatal: Entry 'VERSION' would be overwritten by merge. Cannot merge.
No merge strategy handled the merge.