Also, ensure we show the correct prompt when files have conflicts. Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Antonio Scandurra committed on 4/5/2022, 5:38:27 PMparentcac0ddd
1 file changedLine totals unavailable
Also, ensure we show the correct prompt when files have conflicts. Co-Authored-By: Nathan Sobo <nathan@zed.dev>