diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:54 -0700 |
commit | 6c6f87842bcb8ac4d36922cec5b5ce25de14756e (patch) | |
tree | a846522ebad998f36a8d5a27a7301fc72825efc9 /builtin/diff.c | |
parent | Merge branch 'tc/merge-m-log' (diff) | |
parent | convert: Keep foreign $Id$ on checkout. (diff) | |
download | tgif-6c6f87842bcb8ac4d36922cec5b5ce25de14756e.tar.xz |
Merge branch 'hg/id-munging'
* hg/id-munging:
convert: Keep foreign $Id$ on checkout.
convert: Safer handling of $Id$ contraction.
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions