mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Update draft release notes to 1.7.1.1
  tests: remove unnecessary '^' from 'expr' regular expression

Conflicts:
	diff.c
This commit is contained in:
Junio C Hamano
2010-06-22 09:35:36 -07:00
parent 6df2ffaeef a4c24549ac
commit 262657dce6
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
diff.c
View File

@ -2620,7 +2620,6 @@ static void fill_metainfo(struct strbuf *msg,
}
/* fallthru */
default:
/* nothing */
*must_show_header = 0;
}
if (one && two && hashcmp(one->sha1, two->sha1)) {