[PATCH] potential fix for nmbug merge problems

--- scripts/nmbug | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) This seems to fix the problems with merges failing on dirty indexes. I didn't have time to trace through all of the ramifications, but it seems to me by doing a merge with the default index, we are getting some kind of

[PATCH] potential fix for nmbug merge problems

--- scripts/nmbug | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) This seems to fix the problems with merges failing on dirty indexes. I didn't have time to trace through all of the ramifications, but it seems to me by doing a merge with the default index, we are getting some kind of