On 02/21/2012 02:14 PM, Eric Blake wrote: > > Picking another character would work as a compromise. Even a line > of '-------' is a visual separator; only '<', '=', and '>' give me > heartburn in the context of merge conflict resolution. > OK, I went for the "~" character, that is the one that provides the best visual appearance IMO.
Thanks, Stefano