diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
| commit | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (patch) | |
| tree | 231f5c31f279d3e798702fe61e9b6bcef52b089b /tools/mergetr/mergetr.cpp | |
| parent | 6d0157ea558089bb957f35263424a405e42a6931 (diff) | |
| parent | fe7969ef886d7287fa959929ddd33fbad8407884 (diff) | |
| download | tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.tar.gz tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'tools/mergetr/mergetr.cpp')
| -rw-r--r-- | tools/mergetr/mergetr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp index b87875657..da978dc4e 100644 --- a/tools/mergetr/mergetr.cpp +++ b/tools/mergetr/mergetr.cpp @@ -331,7 +331,7 @@ int main( int argc, char* argv[] ) int orgfile = 1; int newfile = 2; - if ( argc <= newfile || argc > 1 && argv[1][0] == '-') { + if ( argc <= newfile || ( argc > 1 && argv[1][0] == '-' ) ) { printf("usage: %s orgfile newfile [outfile]\n", argv[0]); exit(1); } |