mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add a link to git-union-merge

Browse source
This commit is contained in:
http://adamspiers.myopenid.com/ 2011-12-13 22:01:13 +00:00 • committed by admin
parent 490810ff9f
commit c92d407efd
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/internals.mdwn
View file

@ -77,7 +77,7 @@ Example:
1287290776.765152s 1 e605dca6-446a-11e0-8b2a-002170d25c55 1287290776.765152s 1 e605dca6-446a-11e0-8b2a-002170d25c55
1287290767.478634s 0 26339d22-446b-11e0-9101-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. The timestamps allow the most recent information to be identified.
## `remote/web/aaa/bbb/*.log` ## `remote/web/aaa/bbb/*.log`