Ensure that conflicts are staged and never ignored#1062

Merged

nulltoken merged 4 commits intovNextfrom

ethomson/stage_ignores

Jun 11, 2015

Commits on May 29, 2015

stage tests: stage ignored files properly

ethomson
authored and
Edward Thomson
committed

Commits on May 30, 2015

stage tests: ensure we can stage conflicts
ethomson
committed

Commits on Jun 11, 2015

Introduce FileStatus.Conflicted
Edward Thomson
committed
mergedrepo_wd: turn on core.autocrlf=false
Edward Thomson
committed