{"thread":{"id":"33125","subject":"[PATCH 06/19] merging change from nresni","startedAt":"2013-03-09T19:25:11Z","lastAt":"2013-03-09T19:25:11Z","messageCount":1,"participants":["Paul Campbell"],"isPatch":true,"patchVersion":1,"patchTotal":19},"messages":[{"id":"210913","messageId":"CALeLG_kZbizBdXsYe-uu7ouZ_Y4Kuj88oPV0XgcjQ1Dfki+BrA@mail.gmail.com","threadId":"33125","inReplyTo":null,"subject":"[PATCH 06/19] merging change from nresni","fromName":"Paul Campbell","fromEmail":"pcampbell@kemitix.net","sentAt":"2013-03-09T19:25:11Z","receivedAt":"2013-03-09T19:25:11Z","isPatch":true,"sender":{"key":"pcampbell@kemitix.net","avatar":"https://gravatar.com/avatar/57584e05501b694929004e43fcd7308f4ad64df2eb0474cd8c7e5f93662bb0f1?d=mp&s=160"},"body":">From b6c810480547966c73bcaaea4c069fe73dacbc05 Mon Sep 17 00:00:00 2001\nFrom: Paul Campbell <pcampbell@kemitix.net>\nDate: Sat, 9 Mar 2013 18:32:24 +0000\nSubject: [PATCH 06/19] merging change from nresni\n\nmanual merge at the moment...i'll try a proper merge next now that\nformatting is cleaner\n\nConflicts:\n\tgit-subtree.sh\n\nFixes hidden carriage return\n\nOriginal-Author: mhoffman <matt.hoffman@quantumretail.com>\nConflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>\n---\n contrib/subtree/git-subtree.sh | 3 +--\n 1 file changed, 1 insertion(+), 2 deletions(-)\n\ndiff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\nindex 74e4c74..8056851 100755\n--- a/contrib/subtree/git-subtree.sh\n+++ b/contrib/subtree/git-subtree.sh\n@@ -605,8 +605,7 @@ cmd_split()\n \teval \"$grl\" |\n \twhile read rev parents; do\n \t\trevcount=$(($revcount + 1))\n-\t\tsay -n \"$revcount/$revmax ($createcount)\n-\"\n+\t\tsay -ne \"$revcount/$revmax ($createcount)\\r\"\n \t\tdebug \"Processing commit: $rev\"\n \t\texists=$(cache_get $rev)\n \t\tif [ -n \"$exists\" ]; then\n-- \n1.8.2.rc1\n\n\n-- \nPaul [W] Campbell\n"}]}