Sorry, I should have squashed that in, but I *just* noticed the conflict with 433860f (diff: improve positioning of add/delete blocks in diffs, 2016-09-05). --- t/{t4061-diff-pickaxe.sh => t4062-diff-pickaxe.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename t/{t4061-diff-pickaxe.sh => t4062-diff-pickaxe.sh} (100%) diff --git a/t/t4061-diff-pickaxe.sh b/t/t4062-diff-pickaxe.sh similarity index 100% rename from t/t4061-diff-pickaxe.sh rename to t/t4062-diff-pickaxe.sh -- 2.10.0.windows.1.10.g803177d