Re: [PATCH 0/2] Teaching -Xours/-Xtheirs to binary ll-merge driver

2012-09-09 Thread Stephen Bash
- Original Message - > From: "Junio C Hamano" > Sent: Sunday, September 9, 2012 12:40:37 AM > Subject: [PATCH 0/2] Teaching -Xours/-Xtheirs to binary ll-merge driver > > The part that grants Stephen's wish is unchanged from the earlier > "perhaps

[PATCH 0/2] Teaching -Xours/-Xtheirs to binary ll-merge driver

2012-09-08 Thread Junio C Hamano
The part that grants Stephen's wish is unchanged from the earlier "perhaps like this" patch, but this time with a bit of documentation and test. A more important change between the two actually is [PATCH 2/2]. When a "binary" synthetic attribute is given to a path, we used to (1) disable textual d