DEFAULT_CONFLICT_MARKER_SIZE 366 ll-merge.c int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; DEFAULT_CONFLICT_MARKER_SIZE 382 ll-merge.c marker_size = DEFAULT_CONFLICT_MARKER_SIZE; DEFAULT_CONFLICT_MARKER_SIZE 396 ll-merge.c int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; DEFAULT_CONFLICT_MARKER_SIZE 403 ll-merge.c marker_size = DEFAULT_CONFLICT_MARKER_SIZE; DEFAULT_CONFLICT_MARKER_SIZE 157 xdiff/xmerge.c marker_size = DEFAULT_CONFLICT_MARKER_SIZE;