Segfault on merge with 1.6.2.1 · Michael Johnson <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Miklos Vajna <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Michael Johnson <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Johannes Schindelin <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Miklos Vajna <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Michael Johnson <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Michael Johnson <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Miklos Vajna <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Clemens Buchacher <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Michael Johnson <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Clemens Buchacher <hidden> · 2016-06-15
[PATCH 1/3] add tests for merging with submodules · Clemens Buchacher <hidden> · 2016-06-15
[PATCH 2/3] update cache for conflicting submodule entries · Clemens Buchacher <hidden> · 2016-06-15
[PATCH 3/3] simplify output of conflicting merge · Clemens Buchacher <hidden> · 2016-06-15
Re: [PATCH 3/3] simplify output of conflicting merge · Junio C Hamano <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Johannes Schindelin <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Michael Johnson <hidden> · 2016-06-15
Re: Segfault on merge with 1.6.2.1 · Clemens Buchacher <hidden> · 2016-06-15

Re: [PATCH 3/3] simplify output of conflicting merge

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:46:33

Will queue, forking from maint.  Thanks.