author | Ryan VanderMeulen <ryanvm@gmail.com> |
Fri, 17 Nov 2017 16:26:32 -0500 (2017-11-17) | |
changeset 369 | 7a7753947603ca2608bd1a8f8a4f3829f21b0350 |
parent 368 | 5976d55cf6e9d33d91df2aa010e6628eb6b6beb9 |
child 370 | 9460a7fd76a98605b48f7b901b4e73ab824afbd6 |
push id | 185 |
push user | ryanvm@gmail.com |
push date | Tue, 28 Nov 2017 22:15:36 +0000 (2017-11-28) |
bugs | 1418487 |
mercurial.ini | file | annotate | diff | comparison | revisions |
--- a/mercurial.ini +++ b/mercurial.ini @@ -26,17 +26,17 @@ status.removed = red bold status.unknown = yellow bold [diff] git = true showfunc = true unified = 8 [fsmonitor] -mode = on +mode = off timeout = 10.0 [merge-tools] kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output kdiff3.regkey=Software\KDiff3 kdiff3.regkeyalt=Software\Wow6432Node\KDiff3 kdiff3.regappend=\kdiff3.exe kdiff3.fixeol=True