Lukas Fleischer ae7d2d4c6b Only run the merge tool on files with differences
If the backup file and the data file are equal, there is no need to run
the merge tool.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
2014-07-17 12:03:34 +02:00
..
2014-07-16 20:09:29 +02:00
2014-07-16 23:53:30 +02:00
2014-07-16 23:53:30 +02:00
2014-07-08 12:54:03 +02:00
2014-05-18 11:03:10 +02:00
2014-05-19 10:25:58 +02:00
2014-05-18 11:03:15 +02:00
2014-05-18 11:03:15 +02:00
2014-07-17 08:49:16 +02:00