diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-01-31 14:41:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-31 14:43:30 -0800 |
| commit | 9299c4f147bcff603eef187eb04fe38153571d30 (patch) | |
| tree | e348ab4c4cfcfc32384bb0363cec1a6f6e04abf6 /builtin-merge-file.c | |
| parent | t9200: do not test -x bit if the filesystem does not support it. (diff) | |
| parent | user-manual: todo's (diff) | |
| download | tgif-9299c4f147bcff603eef187eb04fe38153571d30.tar.xz | |
Merge branch 'master' of git://linux-nfs.org/~bfields/git
This is in the hope of giving JBF's user-manual wider exposure.
I am not very happy with trailing whitespaces in the new
document, but let's not worry too much about the formatting
issues for now, but concentrate more on the structure and the
contents.
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions