| commit | 33c0a7504eb0fbfe8832ddcfd2c7c4b3c02e5319 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 11 Nov 2007 13:52:47 +0000 (11 13:52 +0000) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 11 Nov 2007 14:53:30 +0000 (11 14:53 +0000) | ||
| tree | 9192b2cf3d007698b3d957b4b6bd93043b42af1e | treesnapshot (tar.gz zip) |
| parent | 6b9f63c9dc290a11e779c3460a49c1dd39041e72 | commitdiff |
Add a test for git-merge-one-file
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| t/t6029-merge-one-file.sh | [new file with mode: 0644] | blob |