builtin-merge: refresh the index before calling a strategy
In case a file is touched but has no real changes then we just have to update the index and should not error out. Signed-off-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
Showing
想要评论请 注册 或 登录