| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2014-05-18 | New formula for git-imerge | josmo | |
| git-imerge performs a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. Closes #27042. Signed-off-by: Jack Nagel <jacknagel@gmail.com> | |||
 |
index : homebrew | |
| :beer: The missing package manager for OS X. |
| aboutsummaryrefslogtreecommitdiffstats |