https://bugzilla.novell.com/show_bug.cgi?id=675404 https://bugzilla.novell.com/show_bug.cgi?id=675404#c1 --- Comment #1 from Ismail Donmez 2011-02-28 12:24:46 UTC --- (In reply to comment #0)

osc pull creates %{name}.spec.new, %{name}.spec.old and %{name}.spec.mine, when there are conflicts. Add .mine to filetype.vim to enable syntax highlighting.

Diff: http://paste.opensuse.org/40675343

Looks good, can you create a request on OBS? -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.

https://bugzilla.novell.com/show_bug.cgi?id=675404 https://bugzilla.novell.com/show_bug.cgi?id=675404#c3 Ismail Donmez changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #3 from Ismail Donmez 2011-03-02 14:07:56 UTC --- Fixed in Factory. -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.