| commit | e04526fd60544649c8ae9ebddcd3e4f286888744 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 11 Nov 2007 14:09:00 +0000 (11 14:09 +0000) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 11 Nov 2007 14:54:35 +0000 (11 14:54 +0000) | ||
| tree | 9c66d2311efc0677e0b03d7078864467a43ceeb0 | treesnapshot (tar.gz zip) |
| parent | 33c0a7504eb0fbfe8832ddcfd2c7c4b3c02e5319 | commitdiff |
Make git-merge-one-file a builtin
[WIP: this fails t6029 as of now.]
The plan is, of course, to get rid of the fork() altogether,
calling merge_one_file() from merge-index directly.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
[WIP: this fails t6029 as of now.]
The plan is, of course, to get rid of the fork() altogether,
calling merge_one_file() from merge-index directly.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>