diff options
| author |  http://adamspiers.myopenid.com/ <Adam@web> | 2011-12-13 22:01:13 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2011-12-13 22:01:13 +0000 |
| commit | c92d407efdcff347376a4186abe84fa8f2240996 (patch) | |
| tree | 3dfc849ad529d345a30335b5f4f9e28ad1e14847 /doc/internals.mdwn | |
| parent | 490810ff9fba8e4711fef8025c655b2fa66b8801 (diff) | |
add a link to git-union-merge
Diffstat (limited to 'doc/internals.mdwn')
| -rw-r--r-- | doc/internals.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/internals.mdwn b/doc/internals.mdwn index 68cc7c3cd..b2fd1e554 100644 --- a/doc/internals.mdwn +++ b/doc/internals.mdwn @@ -77,7 +77,7 @@ Example: 1287290776.765152s 1 e605dca6-446a-11e0-8b2a-002170d25c55 1287290767.478634s 0 26339d22-446b-11e0-9101-002170d25c55 -These files are designed to be auto-merged using git's union merge driver. +These files are designed to be auto-merged using git's [[union merge driver|git-union-merge]]. The timestamps allow the most recent information to be identified. ## `remote/web/aaa/bbb/*.log` |