log

age author description
Sat, 16 Nov 2013 15:54:41 -0500 Mads Kiilerich largefiles: stylistic cleanup of filemerge
Sat, 16 Nov 2013 15:46:29 -0500 Mads Kiilerich largefiles: show hashes before prompting for conflict resolution
Sat, 16 Nov 2013 15:46:29 -0500 Mads Kiilerich largefiles: don't try to explain rename history before prompt for conflicts
Sat, 16 Nov 2013 15:46:29 -0500 Mads Kiilerich largefiles: drop redundant special handling of merges of renames