diff options
| author | Alexander Potashev <aspotashev@gmail.com> | 2009-01-04 21:39:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-04 15:08:49 -0800 |
| commit | 34263de0265a484bf44058819a363bb1e627c0ce (patch) | |
| tree | e33524d34269861730abb1f3386ca90db92d8ab8 /merge-tree.c | |
| parent | 5c7eee03da32ac8ff5e91159670558b0d7fb9b1a (diff) | |
| download | git-34263de0265a484bf44058819a363bb1e627c0ce.tar.gz | |
Replace deprecated dashed git commands in usage
Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
| -rw-r--r-- | merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c index f18201acdb..f01e7c81ae 100644 --- a/merge-tree.c +++ b/merge-tree.c @@ -4,7 +4,7 @@ #include "blob.h" #include "exec_cmd.h" -static const char merge_tree_usage[] = "git-merge-tree <base-tree> <branch1> <branch2>"; +static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>"; static int resolve_directories = 1; struct merge_list { |