Re: [PATCH 1/3] merge-file: add option to specify the marker size
From: Bert Wesarg <hidden>
Date: 2016-06-15 22:48:22
[ Sorry again, I removed the list again ] On Mon, Mar 1, 2010 at 08:15, Bert Wesarg [off-list ref] wrote:
On Sun, Feb 28, 2010 at 21:13, Junio C Hamano [off-list ref] wrote:quoted
Bert Wesarg [off-list ref] writes:quoted
Signed-off-by: Bert Wesarg <redacted> --- This can probably improved in a way, that the marker size will be taken from attributes. This could be done by an explicit --marker-size-by-path option or an option which names one of the three input files as a git path.You don't want any option that is specifically about "marker size". An option to specify the path to take attributes for would be the right way to go. You might want to see "hash-object --path" for an inspiration.So you suggest that it is only possible to set the conflict marker size for merges inside a git directory? I don't think this is a good idea, for a tool which is designed to work also outside of a git directory. In any case, if we add a --path option, merge-file should use ll_merge in this case, right? Bert