Added Features to Keep Both Changes & Swap (keeps both but swaps)

sascha-wolf / sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.

MIT License

44 stars 6 forks source link

Closed realdubb closed 5 years ago

realdubb commented 7 years ago

Added tests for new features
Changed terminology between keep ours/theirs to head/current following this convention: https://wincent.com/wiki/Understanding_Git_conflict_markers
Turned off gutter marks by default - found them confusing/inaccurate