diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-24 19:21:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 19:35:34 -0700 |
| commit | a757c646ee78ae21c9e8ac66dcc52e361c15c7d2 (patch) | |
| tree | 192c2ed53220b1973ba21eda68bd0b847b0e0291 /Documentation/git-replace.txt | |
| parent | 8588567c96490b8d236b1bc13f9bcb0dfa118efe (diff) | |
| download | git-a757c646ee78ae21c9e8ac66dcc52e361c15c7d2.tar.gz | |
diff --check: honor conflict-marker-size attribute
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-replace.txt')
0 files changed, 0 insertions, 0 deletions