Browse Source
Sasa and I were reviewing this code today and Sasa pointed out we can simplify the conflict logic, as the two cases (subtree and file) are logically identical. Change-Id: Ie0d40b2dd15605785eff453a846b1d20a2d021fc Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Reviewed-by: Sasa Zivkov <zivkov@gmail.com>stable-0.10
Shawn O. Pearce
14 years ago
1 changed files with 3 additions and 7 deletions
Loading…
Reference in new issue