1 Commits

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