From: Junio C Hamano <junkio@cox.net>
Date: Thu, 29 Jun 2006 06:42:40 +0000 (-0700)
Subject: Merge branch 'js/patch'
X-Git-Tag: v1.4.1~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f38c2a9c9982950109d0eb0802b9713dfffeb18b;p=git.git

Merge branch 'js/patch'

* 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
---

f38c2a9c9982950109d0eb0802b9713dfffeb18b