2 Commits

Author SHA1 Message Date
Stefan Liebl
ed396818c8 improve gvimmerge
Change-Id: Ia6b607be73379819c3a64a3980ba05acf827fa23
2014-06-24 10:38:39 +02:00
Stefan Liebl
032cdfc6c9 + gvimmerge: opens a gvim with some tabs to resolve conflicts
Change-Id: I5d797655d5f7f316f25acf13c9e9295fd3599893
2014-06-05 16:14:37 +02:00