master
Honor the conflict-marker-size gitattribute
Auto-dismiss the continue-rebase prompt when it becomes stale
Add a root item ("/") if files at top level have changed
Only prompt to continue a rebase/merge if we started it
Provide conflict resolution dialogs for non-textual conflicts
Route space to the conflict picker for non-textual conflicts
Construct arg vector manually rather than parse string