diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:48:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:48:17 -0700 |
| commit | 7abc6b715148118518a6fbdcef82b3e0dabbaa17 (patch) | |
| tree | 3fd64d8bc843b718be6e4ee57dbb5473e2a60705 /Documentation/merge-options.txt | |
| parent | f241c08d40ad9d479fb88e99ff0bb90d6dd73eda (diff) | |
| parent | b3d6e6e7075967659dc2f5064b4829902cca67da (diff) | |
| download | git-7abc6b715148118518a6fbdcef82b3e0dabbaa17.tar.gz | |
Merge branch 'an/diff-index-doc'
* an/diff-index-doc:
Documentation/diff-index: mention two modes of operation
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions