blob: d61cd6a5cdd179de6cb5a5650d4b5d6c769f71e4 [file] [log] [blame]
/**
* Content and commit history merge algorithms.
*/
package org.eclipse.jgit.merge;