diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2005-07-07 02:39:35 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 10:29:30 -0700 |
| commit | ff9206e72c71aa2e51c7cbee911f47b5838a5845 (patch) | |
| tree | d4f74f740dfcb97670df7b69e64b252149db2bfb /sha1_file.c | |
| parent | 4d3a63ba3a1f80e03312c5ec28734b27583a0756 (diff) | |
| download | git-ff9206e72c71aa2e51c7cbee911f47b5838a5845.tar.gz git-ff9206e72c71aa2e51c7cbee911f47b5838a5845.tar.xz | |
[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
This patch passes the test case introduced by the previous patch.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions