formatting and fixes

examples/strdiff3.cpp

@@ -1,35 +1,35 @@
 
-#include <dtl/dtl.hpp>
 #include "common.hpp"
+#include <dtl/dtl.hpp>
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
 using namespace std;
 
 using dtl::Diff3;
 
-int main(int argc, char *argv[]){
-    
-    if (isFewArgs(argc, 4)) {
-        cerr << "Too few arguments." << endl;
-        return -1;
-    }
-    
-    typedef char   elem;
-    typedef string sequence;
+int main(int argc, char *argv[]) {
 
-    sequence A(argv[1]);
-    sequence B(argv[2]);
-    sequence C(argv[3]);
-    
-    Diff3< elem, sequence > diff3(A, B, C);
-    diff3.compose();
-    if (!diff3.merge()) {
-        cerr << "conflict." << endl;
-        return 0;
-    }
-    cout << "result:" << diff3.getMergedSequence() << endl;
-    
+  if (isFewArgs(argc, 4)) {
+    cerr << "Too few arguments." << endl;
+    return -1;
+  }
+
+  typedef char elem;
+  typedef string sequence;
+
+  sequence A(argv[1]);
+  sequence B(argv[2]);
+  sequence C(argv[3]);
+
+  Diff3<elem, sequence> diff3(A, B, C);
+  diff3.compose();
+  if (!diff3.merge()) {
+    cerr << "conflict." << endl;
     return 0;
+  }
+  cout << "result:" << diff3.getMergedSequence() << endl;
+
+  return 0;
 }