diff tests/test-convert-cvs.t @ 26616:2f1fce0d4e86

merge.mergestate._resolve: also return completed status We'll need this for a new 'preresolve' function we're adding.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 18:37:54 -0700
parents 75e29fcc5a71
children 0823f0983eaa
line wrap: on
line diff