Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 626:5afc7eedb3dd v1.1rc1
@since, TODOs. Tests: add 1 sec to deal with fs timestamp granularity on linux
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Tue, 21 May 2013 19:30:12 +0200 |
parents | b3c16d1aede0 |
children | 6526d8adbc0f |