diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-16 16:36:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 16:36:03 -0800 |
| commit | 38a5932be8a8f0b0bd3bb949bdc5258d9c753f15 (patch) | |
| tree | 988476312dea85d849b00b42b812f626bd7dbf29 /Documentation/git-merge-file.txt | |
| parent | cf7a64b54afe28ff61b362abc04399de383977e0 (diff) | |
| parent | 4a689afb030c1cd5aa1c141db94bbf9dde42f05e (diff) | |
| download | git-38a5932be8a8f0b0bd3bb949bdc5258d9c753f15.tar.gz git-38a5932be8a8f0b0bd3bb949bdc5258d9c753f15.tar.xz | |
Merge branch 'maint'
* maint:
difftool: provide basename to external tools
git-difftool.txt: correct the description of $BASE and describe $MERGED
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions