Merge branch 'js/patch'
authorJunio C Hamano <junkio@cox.net>
Thu, 29 Jun 2006 06:42:40 +0000 (23:42 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 29 Jun 2006 06:42:40 +0000 (23:42 -0700)
* js/patch:
diff.c: fix get_patch_id()
t4014: fix test commit labels.
format-patch: use clear_commit_marks() instead of some ad-hockery
t4014: fix for whitespace from "wc -l"
t4014: add format-patch --ignore-if-in-upstream test
format-patch: introduce "--ignore-if-in-upstream"
add diff_flush_patch_id() to calculate the patch id

Trivial merge