tests/test-dirstate-future.out
author Steve Borho <steve@borho.org>
Mon, 15 Feb 2010 21:18:16 -0600
branchstable
changeset 10486 6b354a763617
parent 9378 1a7bcf58ba56
permissions -rw-r--r--
mergetools: improve configuration for several merge tools * meld - provide labels for the three panes * diffmerge - add registry key for detection, improve arguments * beyond compare - add linux version * winmerge - improve arguments * araxis - add configuration, including registry key for detection * misc - provide default priorities for more tools
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9378
1a7bcf58ba56 dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     1
adding a
1a7bcf58ba56 dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     2
n 644          2 2021-01-01 12:00:00 a