diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:26 -0700 |
commit | 9a33b691aaaae995b2da65a08d927c31106c8a3d (patch) | |
tree | d07a1efd88b32931baaf9f9d3940973cbb447bf1 /diff-lib.c | |
parent | 17e2b114a8f9d66d7c9263755f89cc503c94c38c (diff) | |
parent | f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5 (diff) | |
download | git-9a33b691aaaae995b2da65a08d927c31106c8a3d.tar.gz |
Merge branch 'cn/eradicate-working-copy'
* cn/eradicate-working-copy:
Remove 'working copy' from the documentation and C code
Diffstat (limited to 'diff-lib.c')
-rw-r--r-- | diff-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c index ebe751e72d..62f4cd94cf 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -289,7 +289,7 @@ static void show_new_file(struct rev_info *revs, /* * New file in the index: it might actually be different in - * the working copy. + * the working tree. */ if (get_stat_data(new, &sha1, &mode, cached, match_missing, &dirty_submodule, &revs->diffopt) < 0) |