diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-10-27 16:07:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-27 17:16:40 -0700 |
| commit | 5b329a5f5e3625cdc204e3d274c89646816f384c (patch) | |
| tree | 22d7f9d166ed131f200e96c85d0ed4155ca9eba8 /builtin-archive.c | |
| parent | merge-recursive: adjust to loosened "working file clobbered" check (diff) | |
| download | tgif-5b329a5f5e3625cdc204e3d274c89646816f384c.tar.xz | |
t6022: ignoring untracked files by merge-recursive when they do not matter
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-archive.c')
0 files changed, 0 insertions, 0 deletions