diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 02:52:54 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 02:52:54 (GMT) |
| commit | 75118b13bc8187c629886b108929f996c47daf01 (patch) | |
| tree | 7a191717f2b03af0ac1978e9cfc19826836f5c3c /merge-base.c | |
| parent | 74b2428f5573b1f68ce717706296ae7d1832cd65 (diff) | |
| download | git-75118b13bc8187c629886b108929f996c47daf01.zip git-75118b13bc8187c629886b108929f996c47daf01.tar.gz git-75118b13bc8187c629886b108929f996c47daf01.tar.bz2 | |
Ass a "merge-cache" helper program to execute a merge on
any unmerged files.
This one doesn't actually do the merging, but it makes it
easy to script the programs that do using it.
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions