On Dec 15, 2010, at 16:30 , Wilson, Ronald wrote: > Sometimes I wish the conflict notation was something like: > > #error BEGIN MERGE CONFLICT > > Instead of > > <<<<<<< BEGIN MERGE CONFLICT > > But I know that would only work in C/C++/C#. I just wish there was some way > that the compiler could tell me about the merge conflict more clearly instead > of hunting for a syntax error side effect.
Doesn't this call for configurable notation? ;) Kind regards, Remigiusz Modrzejewski _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
