Re: [PATCH] merge-recursive: Fix copy-paste mistake

2014-09-24 Thread Stefan Beller
1985955b3ab2bad5ac73cbee92d19f63cdbaa3c9 Mon Sep 17 00:00:00 2001 From: Stefan Beller stefanbel...@gmail.com Date: Wed, 24 Sep 2014 14:51:55 +0200 Subject: [PATCH] lots of printfs for debugging [PATCH] merge-recursive: Fix copy-paste mistake --- merge-recursive.c | 52

[PATCH] merge-recursive: Fix copy-paste mistake

2014-09-21 Thread Stefan Beller
The following issue was found by scan.coverity.com (ID: 1049510), and claimed to be likely a copy-paste mistake. Introduced in 331a1838b (2010-07-02, Try normalizing files to avoid delete/modify conflicts when merging), which is quite a long time ago, so I'm rather unsure if it's of any impact or