http://www.scootersoftware.com/download.php
Ron Wilson, Engineering Project Lead
(o) 434.455.6453, (m) 434.851.1612, www.harris.com
HARRIS CORPORATION | RF Communications Division
assuredcommunications(tm)
-Original Message-
From: fossil-users-boun...@lists.fossil-scm.org
Or would it be sufficient for Fossil to merely retain the three input
files to the merge using some suffix when there is a conflict:
problem.c~BASE
problem.c~OTHER
problem.c~THIS
Fossil would still writes its output (contain the CONFLICT
marks that people don't like)
2 matches
Mail list logo
