Re: [PATCH/RFC] Color merge conflicts

2018-07-31 Thread Elijah Newren
On Mon, Jul 30, 2018 at 10:40 AM, Stefan Beller wrote: > On Mon, Jul 30, 2018 at 9:00 AM Nguyễn Thái Ngọc Duy > wrote: >> >> One of the things I notice when watching a normal git user face a >> merge conflicts is the output is very verbose (especially when there >> are multiple conflicts) and

Re: [PATCH/RFC] Color merge conflicts

2018-07-30 Thread Stefan Beller
On Mon, Jul 30, 2018 at 9:00 AM Nguyễn Thái Ngọc Duy wrote: > > One of the things I notice when watching a normal git user face a > merge conflicts is the output is very verbose (especially when there > are multiple conflicts) and it's hard to spot the important parts to > start resolving

[PATCH/RFC] Color merge conflicts

2018-07-30 Thread Nguyễn Thái Ngọc Duy
One of the things I notice when watching a normal git user face a merge conflicts is the output is very verbose (especially when there are multiple conflicts) and it's hard to spot the important parts to start resolving conflicts unless you know what to look for. This is the start to hopefully