Re: [PATCH 3/4] Added tests for the case of merged and unmerged entries for the same file

2014-08-21 Thread Junio C Hamano
Jaime Soriano Pastor writes: > On Wed, Aug 20, 2014 at 11:00 PM, Junio C Hamano wrote: >> Jaime Soriano Pastor writes: >> >>> Signed-off-by: Jaime Soriano Pastor >>> --- >>> t/t9904-unmerged-file-with-merged-entry.sh | 86 >>> ++ >> >> Isn't this number already use

Re: [PATCH 3/4] Added tests for the case of merged and unmerged entries for the same file

2014-08-21 Thread Jaime Soriano Pastor
On Wed, Aug 20, 2014 at 11:00 PM, Junio C Hamano wrote: > Jaime Soriano Pastor writes: > >> Signed-off-by: Jaime Soriano Pastor >> --- >> t/t9904-unmerged-file-with-merged-entry.sh | 86 >> ++ > > Isn't this number already used for another test? A test on the > inde

Re: [PATCH 3/4] Added tests for the case of merged and unmerged entries for the same file

2014-08-20 Thread Junio C Hamano
Jaime Soriano Pastor writes: > Signed-off-by: Jaime Soriano Pastor > --- > t/t9904-unmerged-file-with-merged-entry.sh | 86 > ++ Isn't this number already used for another test? A test on the index probably belongs to t2XXX or t3XXX family. > 1 file changed, 86 i

[PATCH 3/4] Added tests for the case of merged and unmerged entries for the same file

2014-08-20 Thread Jaime Soriano Pastor
Signed-off-by: Jaime Soriano Pastor --- t/t9904-unmerged-file-with-merged-entry.sh | 86 ++ 1 file changed, 86 insertions(+) create mode 100755 t/t9904-unmerged-file-with-merged-entry.sh diff --git a/t/t9904-unmerged-file-with-merged-entry.sh b/t/t9904-unmerged-file