Permalink
Browse files

ttlogmerge: Give usage notes

  • Loading branch information...
1 parent ec02201 commit 5104ea0eaa8eab7c9b41a2efbdceac57ba7c097a @pmyteh committed Dec 20, 2013
Showing with 6 additions and 1 deletion.
  1. +6 −1 script/ttlogmerge.pl
View
7 script/ttlogmerge.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# Syntax: ttlogmerge logfile1 logfile2 outputlogfile
+# Syntax: ttlogmerge.pl logfile1 logfile2 outputlogfile
#
# A helper script for the Unison file synchroniser. One option for Unison is to
# use an external program to merge two files which have been change in both
@@ -16,6 +16,11 @@
# If a ping exists in both files and both or neither are tagged "RETRO",
# then use the one with the most tags entered.
# Note that it is assumed that both files have timestamps in ascending order.
+#
+# This is best used by adding something like the following to your Unison
+# preferences file:
+#
+# merge = Path path/to/tagtime/*.log -> /path/to/ttlogmerge.pl CURRENT1 CURRENT2 NEW
use strict;
use warnings;

0 comments on commit 5104ea0

Please sign in to comment.