| commit | 3943da39d2331c0e8f9c024a66f100f8b98b53cf | |
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Tue, 21 Aug 2007 21:29:51 +0000 (21 23:29 +0200) | ||
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Wed, 22 Aug 2007 19:01:28 +0000 (22 21:01 +0200) | ||
| tree | b1a8261a9f1d8b424b6f7a7c35ccb2fafce07ed7 | treesnapshot (tar.gz zip) |
| parent | 71d2a033a234e3493da7547972002a1cfa1acf0a | commitdiff |
Make attempt to refresh when merge conflicts exists more user friendly
The index code does not handle conflict entries (yet).
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
The index code does not handle conflict entries (yet).
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>