:lipstick: Conflict regex fits windows too
Handle add-add conflicts just like both-modified.
GitBridge tracks paths and reasons for conflict.
Adapt the change in method signature.
Right, don't overwrite the imported `path`.
Merge pull request #55 from smashwilson/add-add-conflicts

Add-add conflicts
Add Linux keybindings.
Add the same ones for Win32.
Use a cmd-m chords for Mac OS too.

Consistency, consistency, consistency.
:lipstick: Use non-matching group in CONFLICT_REGEX
Merge pull request #56 from smashwilson/linux-keybindings

Linux and Windows keybindings
Merge pull request #53 from frk1705/fix-lineEndingsWindows

Conflict regex for windows
:lipstick: Close resolver dialog on quit event
:lipstick: Add button to exit resolver dialog
:lipstick: Enhance ready to stage message
:lipstick: Stage button stages immediately without popup
Add frk1705 to the contributors
:lipstick: Use .eq() and stage-ready class name
:lipstick: Preserve progress bar on reopen
:lipstick: Fix error while staging closed files