diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:47:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:47:03 -0700 |
| commit | b91ffd37d5c18046f7b0bf47e939273bead9e52e (patch) | |
| tree | 6b912973a29e5fa81340388f978904764f5a0f37 /git-mergetool--lib.sh | |
| parent | Merge branch 'jc/maint-add-p-coalesce-fix' into maint (diff) | |
| parent | apply, fmt-merge-msg: use relative filenames (diff) | |
| download | tgif-b91ffd37d5c18046f7b0bf47e939273bead9e52e.tar.xz | |
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint
* sb/maint-1.6.2-opt-filename-fix:
apply, fmt-merge-msg: use relative filenames
commit: -F overrides -t
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions