Skip to content

Ensure that conflicts are staged and never ignored#1062

Merged
nulltoken merged 4 commits into
vNextfrom
ethomson/stage_ignores
Jun 11, 2015
Merged

Ensure that conflicts are staged and never ignored#1062
nulltoken merged 4 commits into
vNextfrom
ethomson/stage_ignores

mergedrepo_wd: turn on core.autocrlf=false

49f9530
Select commit
Loading
Failed to load commit list.

Workflow runs completed with no jobs