Artifact 4734854393f717824ae96b3de8524a2401a21921:

• File test/merge1.test
  • 2013-07-24 12:27:59 — part of check-in [8b47f2d270] on branch trunk — Fix some test-cases, due to name-change "test-3-way-merge" -> "3-way-merge" (user: jan.nijtmans size: 12104)
  • 2013-07-27 21:09:30 — part of check-in [021e41014d] on branch ssh-shared-account — Sync with trunk to get sqlite changes et al. (user: amb size: 12104)
  • 2013-08-08 18:57:39 — part of check-in [9a023e0d6c] on branch git-better-import — Merge with trunk. (user: isaac.jurado size: 12104)
  • 2013-08-14 05:07:57 — part of check-in [35b6048c74] on branch urmil — Taking latest updates from trunk (user: urmil size: 12104)
  • 2013-08-14 05:12:21 — part of check-in [512f9b723a] on branch urmil-backup — Taking latest updates from trunk (user: urmil size: 12104)
  • 2013-08-15 13:13:45 — part of check-in [0ff5fe7638] on branch dg-misc — Merge from trunk. (user: dg size: 12104)
  • 2013-09-04 19:17:27 — part of check-in [79bae86356] on branch cleanX-no-clean-glob — merge trunk (user: jan.nijtmans size: 12104)
  • 2013-09-19 14:42:14 — part of check-in [06f08ed02b] on branch tkt-change-hook — merge trunk (user: jan.nijtmans size: 12104)
  • 2013-10-01 23:01:34 — part of check-in [8d2f9ab128] on branch cleanX — Merge updates from trunk. (user: mistachkin size: 12104)
  • 2013-10-10 02:52:51 — part of check-in [9c3021b097] on branch ashish-ipv6 — Merge from 'trunk' (user: ashish size: 12104)
  • 2013-12-20 12:04:30 — part of check-in [4e3f4d26d8] on branch win32-longpath — Merge trunk. Some more comments. (user: jan.nijtmans size: 12104)
  • 2013-12-20 12:04:30 — part of check-in [4e3f4d26d8] on branch win32-longpath — Merge trunk. Some more comments. (user: jan.nijtmans size: 12104)
  • 2014-02-09 17:14:59 — part of check-in [78862afd3c] on branch prevent-adding-ignored-files — merge trunk (user: jan.nijtmans size: 12104)
  • 2014-06-08 00:03:22 — part of check-in [f91d313169] on branch th1Hooks — Merge updates from trunk. (user: mistachkin size: 12104)