diff options
author | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:34:36 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:35:14 -0700 |
commit | eed94a570e0421175d6b4342c0ac48e03ceedf0b (patch) | |
tree | f33864f2abffdcb83cbf626b26da34f9cc8d5bab /builtin-mailsplit.c | |
parent | 4147d801db66df9b127ffe315601f467aa9d1c48 (diff) | |
parent | 01aaf1f88ddc2b99162c302710339f202996f39b (diff) | |
download | git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz |
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to 'builtin-mailsplit.c')
0 files changed, 0 insertions, 0 deletions