| commit | 5b329a5f5e3625cdc204e3d274c89646816f384c | |
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 27 Oct 2006 23:07:02 +0000 (27 16:07 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 28 Oct 2006 00:16:40 +0000 (27 17:16 -0700) | ||
| tree | 22d7f9d166ed131f200e96c85d0ed4155ca9eba8 | treesnapshot (tar.gz zip) |
| parent | 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae | commitdiff |
t6022: ignoring untracked files by merge-recursive when they do not matter
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| t/t6022-merge-rename.sh | diffblobblamehistory |