Hi Øyvind, there are 2 patches submitted in gerrit for the same file and same lines 1) http://openocd.zylin.com/45 2) http://openocd.zylin.com/52 The patch have both passed the approval process and are now in git.
As result, the patch 2) as been merged in git as first. ok. When later on 1) as been merged too, it generates a commit with empty diff. Please see http://openocd.git.sourceforge.net/git/gitweb.cgi?p=openocd/openocd;a=commitdiff;h=2c31adb31df0fa7608dd5a0fe3ba0acb1cee6a04 There is probably something to tune in the automatic merge from gerrit to git. I also invite the authors of the two patches (you and Edgard) to validate the result of the merge. Best Regards Antonio Borneo _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
