Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge git://repo.or.cz/git-gui into maint
[gitweb.git]
/
merge-tree.c
diff --git
a/merge-tree.c
b/merge-tree.c
index c154dcfc0296879110a6adc3db849b5e6cee27cf..692ede0e3db7df66b2e5943dc58224f34c59fd8c 100644
(file)
--- a/
merge-tree.c
+++ b/
merge-tree.c
@@
-337,7
+337,7
@@
int main(int argc, char **argv)
struct tree_desc t[3];
void *buf1, *buf2, *buf3;
- if (argc
<
4)
+ if (argc
!=
4)
usage(merge_tree_usage);
setup_git_directory();