diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-11-18 04:31:37 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-11-18 02:23:25 -0800 |
| commit | 9f8a15c73437abc634f2c43501105b108c51eae8 (patch) | |
| tree | 2668487edc19d7df6029850170d62a270e5c5c69 /Documentation/git-mergetool.txt | |
| parent | send-pack: assign remote errors to each ref (diff) | |
| download | tgif-9f8a15c73437abc634f2c43501105b108c51eae8.tar.xz | |
Fix warning about bitfield in struct ref
cache.h:503: warning: type of bit-field 'force' is a GCC extension
cache.h:504: warning: type of bit-field 'merge' is a GCC extension
cache.h:505: warning: type of bit-field 'nonfastforward' is a GCC extension
cache.h:506: warning: type of bit-field 'deletion' is a GCC extension
So we change it to an 'unsigned int' which is not a GCC extension.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions