Re: [PATCH 5/5] merge-recursive: simplify handle_change_delete

2018-05-21 Thread Elijah Newren
Hi Dscho, On Mon, May 21, 2018 at 6:41 AM, Johannes Schindelin wrote: > On Sat, 19 May 2018, Elijah Newren wrote: >> On Sat, May 19, 2018 at 12:32 AM, Johannes Sixt wrote: >> > >> > Oh, there is a reason for the repeated message text: translations!

Re: [PATCH 5/5] merge-recursive: simplify handle_change_delete

2018-05-21 Thread Johannes Schindelin
Hi Elijah, On Sat, 19 May 2018, Elijah Newren wrote: > On Sat, May 19, 2018 at 12:32 AM, Johannes Sixt wrote: > > Am 19.05.2018 um 04:07 schrieb Elijah Newren: > >> > >> There is really no need for four branches of nearly identical messages > >> when we can store the differences

Re: [PATCH 5/5] merge-recursive: simplify handle_change_delete

2018-05-19 Thread Elijah Newren
On Sat, May 19, 2018 at 12:32 AM, Johannes Sixt wrote: > Am 19.05.2018 um 04:07 schrieb Elijah Newren: >> >> There is really no need for four branches of nearly identical messages >> when we can store the differences into small variables before printing. > > Oh, there is a reason

Re: [PATCH 5/5] merge-recursive: simplify handle_change_delete

2018-05-19 Thread Johannes Sixt
Am 19.05.2018 um 04:07 schrieb Elijah Newren: There is really no need for four branches of nearly identical messages when we can store the differences into small variables before printing. Oh, there is a reason for the repeated message text: translations! Please do not play sentence Lego with

[PATCH 5/5] merge-recursive: simplify handle_change_delete

2018-05-18 Thread Elijah Newren
There is really no need for four branches of nearly identical messages when we can store the differences into small variables before printing. It does require a few allocations this way, but makes the code much easier to parse for human readers. Signed-off-by: Elijah Newren ---