FlaShG / GitMerge-for-Unity

Unity plugin for merging sceneand prefabs files when using git.
GNU General Public License v2.0
197 stars 26 forks source link

Add a way to apply manual changes #13

Closed FlaShG closed 9 years ago

FlaShG commented 9 years ago

When "we" and "them" both aren't right, one can enter another value. This value, right now, doesn't get applied. Change that.

FlaShG commented 9 years ago

Has already been added at some point. "Part 2" is here: #19