| commit | 386a727e9c1db6f925c1190f6b549c1b4b16e82f | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 9 Mar 2010 16:56:24 +0000 (9 17:56 +0100) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 9 Mar 2010 16:59:27 +0000 (9 17:59 +0100) | ||
| tree | 964d1d5e3c0975ea643109db2ca0fa2c66dedefd | treesnapshot (tar.gz zip) |
| parent | 1f66cfa6e3268f5aee4e26e24f3c3f8c21d12754 | commitdiff |
Add a simple conflict helper
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| bin/edit-conflicts.sh | [new file with mode: 0644] | blob |