Shawn O. Pearce 76db9dec81 Merge branch 'master' into sp/gfi ...

git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it.  This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.

This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).

Conflicts:

	git-compat-util.h

2007-01-30 11:07:24 -05:00

27 KiB

Raw Blame History

View Raw