![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jonas Fonseca <fonseca@diku.dk> | |
| Sat, 29 Sep 2007 01:36:24 +0000 (03:36 +0200) | ||
| committer | Jonas Fonseca <fonseca@diku.dk> | |
| Sat, 29 Sep 2007 01:36:24 +0000 (03:36 +0200) | ||
| commit | b5c18d9d6f568c0779d3f5d7e12eb3dffe3603da | |
| tree | 942e010bb90fea684e7e37a7ad205edb1f1b574f | tree | snapshot |
| parent | d24ef76cf48b2f63c7cf173200f4cf522c119ec9 | commit | diff |
Add support for launching git-mergetool from the status view
Unmerged entries now suggests to press M to resolve merge conflicts.
Unmerged entries are no longer shown for the "staged changes"; the same
goes for 'M'odified entries following an 'U'nmerged entry.
Unmerged entries now suggests to press M to resolve merge conflicts.
Unmerged entries are no longer shown for the "staged changes"; the same
goes for 'M'odified entries following an 'U'nmerged entry.
| manual.txt | diff | blob | history | |
| tig.c | diff | blob | history | |
| tigrc.5.txt | diff | blob | history |